Fixes for JsRender issue 87 (rendering null as "") and JsViews issue …

…48 - use of link=false

jquery.views.js

@@ -7,7 +7,7 @@
  * Copyright 2012, Boris Moore
  * Released under the MIT License.
  */
-// informal pre beta commit counter: 0
+// informal pre beta commit counter: 2
 
 this.jQuery && jQuery.link || (function( global, undefined ) {
 // global is the this object, which is window when running in the usual browser environment.
@@ -319,13 +319,17 @@ function view_removeViews( index, itemsCount ) {
 	// view.removeViews( index ) removes the child view with specified index or key
 	// view.removeViews( index, count ) removes the specified nummber of child views, starting with the specified index
 	function removeView( index ) {
-		var view = views[ index ],
+		var parentElViews, i,
+			view = views[ index ],
 			node = view.prevNode,
 			nextNode = view.nextNode,
-			nodes = [ node ],
-			parentElViews = parentElViews || jsViewsData( view.nextNode.parentNode, viewStr ),
-			i = parentElViews.length;
-
+			nodes = [ node ];
+		if ( !nextNode ) {
+			// this view has not been linked, so nothing to remove.
+			return;
+		}
+		parentElViews = parentElViews || jsViewsData( nextNode.parentNode, viewStr );
+		i = parentElViews.length;
 		if ( i ) {
 			view.removeViews();
 		}
@@ -431,7 +435,7 @@ function linkViews( node, parent, nextNode, depth, data, context, prevNode, inde
 					// Convert to data-link="{:expression}", or for inputs, data-link="{:expression:}" for (default) two-way binding
 					linkMarkup = delimOpen1 + ":" + linkMarkup + ($.nodeName( node, "input" ) ? ":" : "") + delimClose0;
 				}
-				while( tokens = rTag.exec( linkMarkup )) {
+				while( tokens = rTag.exec( linkMarkup )) { // TODO require } to be followed by whitespace or $, and remove the \}(!\}) option.
 					// Iterate over the data-link expressions, for different target attrs, e.g. <input data-link="{:firstName:} title{:~description(firstName, lastName)}"
 					// tokens: [all, attr, tag, converter, colon, html, code, linkedParams]
 					attr = tokens[ 1 ];

jsrender.js

@@ -6,7 +6,7 @@
  * Copyright 2012, Boris Moore
  * Released under the MIT License.
  */
-// informal pre beta commit counter: 1
+// informal pre beta commit counter: 2
 
 this.jsviews || this.jQuery && jQuery.views || (function( window, undefined ) {
 
@@ -158,7 +158,7 @@ function renderTag( tag, parentView, converter, content, tagObject ) {
 	}
 
 	ret = tagFn.apply( tagObject, args.length > 5 ? slice.call( args, 5 ) : [] );
-	return ret || ( ret === undefined ? "" : ret.toString()); // (If ret is the value 0 or false or null, will render to string)
+	return ret || ( ret == undefined ? "" : ret.toString()); // (If ret is the value 0 or false, will render to string)
 }
 
 //=================
@@ -314,9 +314,10 @@ function renderContent( data, context, parentView, path, index ) {
 			// if no parentContext, use context, or default to {}
 			: context || {});
 
-	if ( props.link !== undefined ) {
-		// Override inherited value of link by an explicit setting in props: link=true or link=false
-		context.link = props.link;
+	if ( props.link === FALSE ) {
+		// Override inherited value of link by an explicit setting in props: link=false
+		// The child views of an unlinked view are also unlinked. So setting child back to true will not have any effect.
+		context.link = FALSE;
 	}
 	if ( !tmpl.fn ) {
 		tmpl = templates[ tmpl ] || templates( tmpl );
@@ -489,7 +490,7 @@ function tmplFn( markup, tmpl, bind ) {
 					? (hasEncoder = TRUE, "e(" + params)
 					: converter
 						? (hasConverter = TRUE, 'c("' + converter + '",view,' + params)
-						: (getsValue = TRUE, "((v=" + params + ')!==u?v:""')
+						: (getsValue = TRUE, "((v=" + params + ')!=u?v:""')
 				)
 				: (hasTag = TRUE, 't("' + tag + '",view,"' + (converter || "") + '",'
 					+ (content ? nested.length : '""') // For block tags, pass in the key (nested.length) to the nested content template
@@ -836,7 +837,7 @@ converters({
 	html: function( text ) {
 		// HTML encoding helper: Replace < > & and ' and " by corresponding entities.
 		// inspired by Mike Samuel <msamuel@google.com>
-		return text !== undefined ? String( text ).replace( htmlSpecialChar, replacerForHtml ) : "";
+		return text != undefined ? String( text ).replace( htmlSpecialChar, replacerForHtml ) : "";
 	}
 });