Commit 75 (v0.9.75 - Beta)

Several new and improved documentation topics:

- http://www.jsviews.com/#views JsRender view hierarchy
- http://www.jsviews.com/#getindex Iterating over arrays: accessing the array index
- http://www.jsviews.com/#contextualparams Contextual parameters
- http://www.jsviews.com/#parentdata Accessing parent data
- http://www.jsviews.com/#apps Building apps
- http://www.jsviews.com/#jsrmodel Data / View Model
- http://www.jsviews.com/#compiletmpl Using templates
- http://www.jsviews.com/#d.templates Registering templates: $.templates()
- http://www.jsviews.com/#helpers Using helpers
- http://www.jsviews.com/#helpersapi Registering helpers: $.views.helpers()
- http://www.jsviews.com/#converters Using converters
- http://www.jsviews.com/#convertersapi Registering converters: $.views.converters()

Unit tests
- Many new unit tests added, especially for Browserify scenarios

Bug fixes

- BorisMoore/jsrender#295 Issue with Browserify when loading
  jQuery statically, and JsRender/JsViews as a Browserify module

.gitignore

@@ -1,6 +1,5 @@
 **/.*
 node_modules
 bower_components
-test/browserify/bundles/*.js
 *.config
 Scripts

jquery.observable.js

@@ -1,4 +1,4 @@
-/*! JsObservable v0.9.74 (Beta): http://jsviews.com/#jsobservable */
+/*! JsObservable v0.9.75 (Beta): http://jsviews.com/#jsobservable */
 /*
  * Subcomponent of JsViews
  * Data change events for data-linking
@@ -13,16 +13,16 @@
 	// global var is the this object, which is window when running in the usual browser environment
 	var $ = global.jQuery;
 
-	if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
-		define(["jquery"], function($) {
-			return factory(global, $); // Require jQuery
-		});
-	} else if (typeof exports === "object") { // CommonJS e.g. Browserify
+	if (typeof exports === "object") { // CommonJS e.g. Browserify
 		module.exports = $
 			? factory(global, $)
 			: function($) { // If no global jQuery, take jQuery passed as parameter: require("jsobservable")(jQuery)
 				return factory(global, $);
 			};
+	} else if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
+		define(["jquery"], function($) {
+			return factory(global, $); // Require jQuery
+		});
 	} else { // Browser using plain <script> tag
 		factory(global, false);
 	}
@@ -1073,4 +1073,4 @@ if (!$.observe) {
 }
 
 return $;
-}, this));
+}, window));

jquery.views.js

@@ -1,4 +1,4 @@
-/*! jquery.views.js v0.9.74 (Beta): http://jsviews.com/ */
+/*! jquery.views.js v0.9.75 (Beta): http://jsviews.com/ */
 /*
  * Interactive data-driven views using JsRender templates.
  * Subcomponent of JsViews
@@ -17,16 +17,16 @@
 	// global var is the this object, which is window when running in the usual browser environment
 	var $ = global.jQuery;
 
-	if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
-		define(["jquery", "./jsrender", "./jquery.observable"], function($, jsr, jso) {
-			return factory(global, $, jsr, jso);
-		}); // Require jQuery, JsRender, JsObservable
-	} else if (typeof exports === "object") { // CommonJS e.g. Browserify
+	if (typeof exports === "object") { // CommonJS e.g. Browserify
 		module.exports = $
 			? factory(global, $)
 			: function($) { // If no global jQuery, take jQuery passed as parameter (with JsRender and JsObservable): require("jquery.views")(jQuery)
 				return factory(global, $);
 			};
+	} else if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
+		define(["jquery", "./jsrender", "./jquery.observable"], function($, jsr, jso) {
+			return factory(global, $, jsr, jso);
+		}); // Require jQuery, JsRender, JsObservable
 	} else { // Browser using plain <script> tag
 		factory(global, false);
 	}
@@ -44,7 +44,7 @@ var setGlobals = $ === false; // Only set globals if script block in browser (no
 jsr = jsr || setGlobals && global.jsrender;
 $ = $ || global.jQuery;
 
-var versionNumber = "v0.9.74",
+var versionNumber = "v0.9.75",
 	requiresStr = "JsViews requires ";
 
 if (!$ || !$.fn) {
@@ -3011,4 +3011,4 @@ $viewsSettings.advanced({
 });
 
 	return $;
-}, this));
+}, window));

jsrender.js

@@ -1,4 +1,4 @@
-/*! JsRender v0.9.74 (Beta): http://jsviews.com/#jsrender */
+/*! JsRender v0.9.75 (Beta): http://jsviews.com/#jsrender */
 /*! **VERSION FOR WEB** (For NODE.JS see http://jsviews.com/download/jsrender-node.js) */
 /*
  * Best-of-breed templating in browser or on Node.js.
@@ -15,11 +15,7 @@
 	// global var is the this object, which is window when running in the usual browser environment
 	var $ = global.jQuery;
 
-	if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
-		define(function() {
-			return factory(global);
-		});
-	} else if (typeof exports === "object") { // CommonJS e.g. Browserify
+	if (typeof exports === "object") { // CommonJS e.g. Browserify
 		module.exports = $
 			? factory(global, $)
 			: function($) { // If no global jQuery, take optional jQuery passed as parameter: require('jsrender')(jQuery)
@@ -28,6 +24,10 @@
 				}
 				return factory(global, $);
 			};
+	} else if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
+		define(function() {
+			return factory(global);
+		});
 	} else { // Browser using plain <script> tag
 		factory(global, false);
 	}
@@ -44,7 +44,7 @@ var setGlobals = $ === false; // Only set globals if script block in browser (no
 
 $ = $ && $.fn ? $ : global.jQuery; // $ is jQuery passed in by CommonJS loader (Browserify), or global jQuery.
 
-var versionNumber = "v0.9.74",
+var versionNumber = "v0.9.75",
 	jsvStoreName, rTag, rTmplString, topView, $views,
 
 //TODO	tmplFnsCache = {},
@@ -1216,7 +1216,7 @@ function onRenderError(e, view, fallback) {
 		message = fallback; // There is a settings.debugMode(handler) onError override. Call it, and use return value (if any) to replace message
 	}
 
-	return view && !view.linkCtx && view.linked ? $converters.html(message) : message;
+	return view && !view.linkCtx ? $converters.html(message) : message;
 }
 
 function error(message) {
@@ -2065,4 +2065,4 @@ if (jsrToJq) { // Moving from jsrender namespace to jQuery namepace - copy over
 	jsr.views.sub._jq($);
 }
 return $ || jsr;
-}, this));
+}, window));

jsviews.js

@@ -1,4 +1,4 @@
-/*! jsviews.js v0.9.74 (Beta) single-file version: http://jsviews.com/ */
+/*! jsviews.js v0.9.75 (Beta) single-file version: http://jsviews.com/ */
 /*! includes JsRender, JsObservable and JsViews - see: http://jsviews.com/#download */
 
 /* Interactive data-driven views using JsRender templates */
@@ -16,16 +16,16 @@
 	// global var is the this object, which is window when running in the usual browser environment
 	var $ = global.jQuery;
 
-	if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
-		define(["jquery"], function($) {
-			return factory(global, $);
-		}); // Require jQuery
-	} else if (typeof exports === "object") { // CommonJS e.g. Browserify
+	if (typeof exports === "object") { // CommonJS e.g. Browserify
 		module.exports = $
 			? factory(global, $)
 			: function($) { // If no global jQuery, take jQuery passed as parameter: require("jsviews")(jQuery)
 				return factory(global, $);
 			};
+	} else if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
+		define(["jquery"], function($) {
+			return factory(global, $);
+		}); // Require jQuery
 	} else { // Browser using plain <script> tag
 		factory(global, false);
 	}
@@ -47,7 +47,7 @@ if (!$ || !$.fn) {
 	throw "JsViews requires jQuery"; // We require jQuery
 }
 
-var versionNumber = "v0.9.74",
+var versionNumber = "v0.9.75",
 
 	jsvStoreName, rTag, rTmplString, topView, $views, $observe, $observable,
 
@@ -1220,7 +1220,7 @@ function onRenderError(e, view, fallback) {
 		message = fallback; // There is a settings.debugMode(handler) onError override. Call it, and use return value (if any) to replace message
 	}
 
-	return view && !view.linkCtx && view.linked ? $converters.html(message) : message;
+	return view && !view.linkCtx ? $converters.html(message) : message;
 }
 
 function error(message) {
@@ -6008,4 +6008,4 @@ $viewsSettings.advanced({
 });
 
 return $;
-}, this));
+}, window));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsviews",
-  "version": "v0.9.74",
+  "version": "v0.9.75",
   "description": "Next-generation MVVM and MVP framework - built on top of JsRender templates. Bringing templates to life...",
   "main": "./jsviews.js",
   "author": {
@@ -16,7 +16,6 @@
   "bugs": {
     "url": "https://github.com/borismoore/jsviews/issues"
   },
-  "scripts": {},
   "keywords": [
     "jsviews",
     "jsrender",
@@ -33,7 +32,7 @@
     "glob-stream": "^5.0.0",
     "gulp": "^3.9.0",
     "jquery": "^2.1.4",
-    "jsrender": "^0.9.74",
+    "jsrender": "^0.9.75",
     "qunit": "^0.7.6"
   },
   "dependencies": {}

test/browserify/1-unit-tests.js

@@ -2,12 +2,14 @@
 (function(undefined) {
 "use strict";
 
+browserify.done.one = true;
+
 QUnit.module("Browserify - client code");
 
 test("No jQuery global: require('jsrender')()", function() {
-	// ............................... Hide QUnit global jQuery .................................
-	var jQuery = global.jQuery;
-	global.jQuery = undefined;
+	// ............................... Hide QUnit global jQuery and any previous global jsrender.................................
+	var jQuery = global.jQuery, jsr = global.jsrender;
+	global.jQuery = global.jsrender = undefined;
 
 	// =============================== Arrange ===============================
 	var data = {name: "Jo"};
@@ -23,10 +25,11 @@ test("No jQuery global: require('jsrender')()", function() {
 	result += " " + (jsrender !== jQuery);
 
 	// ............................... Assert .................................
-	equal(result, "Name: Jo (name-template.html) true", "result");
+	equal(result, "Name: Jo (name-template.html) true", "result: No jQuery global: require('jsrender')()");
 
 	// ............................... Reset .................................
 	global.jQuery = jQuery; // Replace QUnit global jQuery
+	global.jsrender = jsr; // Replace any previous global jsrender
 });
 
 })();

test/browserify/10-errors-unit-tests.js

@@ -2,12 +2,14 @@
 (function(undefined) {
 "use strict";
 
+browserify.done.ten = true;
+
 QUnit.module("Browserify - client code");
 
 test('Error cases for require() for JsRender, JsViews, JsObservable, JsRender templates', function() {
-	// ............................... Hide QUnit global jQuery .................................
-	var jQuery = global.jQuery;
-	global.jQuery = undefined;
+	// ............................... Hide QUnit global jQuery and any previous global jsrender.................................
+	var jQuery = global.jQuery, jsr = global.jsrender;
+	global.jQuery = global.jsrender = undefined;
 
 	var $jq, $jsr, tmpl, result;
 	// ................................ Act ..................................
@@ -154,6 +156,7 @@ test('Error cases for require() for JsRender, JsViews, JsObservable, JsRender te
 
 	// ............................... Reset .................................
 	global.jQuery = jQuery; // Replace QUnit global jQuery
+	global.jsrender = jsr; // Replace any previous global jsrender
 });
 
 })();

test/browserify/11-errors-unit-tests.js

@@ -2,12 +2,14 @@
 (function(undefined) {
 "use strict";
 
+browserify.done.eleven = true;
+
 QUnit.module("Browserify - client code");
 
 test('More Errors for require() for JsRender, JsViews, JsObservable, JsRender templates', function() {
-	// ............................... Hide QUnit global jQuery .................................
-	var jQuery = global.jQuery;
-	global.jQuery = undefined;
+	// ............................... Hide QUnit global jQuery and any previous global jsrender.................................
+	var jQuery = global.jQuery, jsr = global.jsrender;
+	global.jQuery = global.jsrender = undefined;
 
 	var $jq, $jsr, tmpl, result;
 
@@ -67,6 +69,8 @@ test('More Errors for require() for JsRender, JsViews, JsObservable, JsRender te
 
 	// ............................... Reset .................................
 	global.jQuery = jQuery; // Replace QUnit global jQuery
+	global.jsrender = jsr; // Replace any previous global jsrender
 });
 
 })();
+

test/browserify/2-unit-tests.js

@@ -2,12 +2,14 @@
 (function(undefined) {
 "use strict";
 
+browserify.done.two = true;
+
 QUnit.module("Browserify - client code");
 
 test("No jQuery global: require('jsrender')($)", function() {
-	// ............................... Hide QUnit global jQuery .................................
-	var jQuery = global.jQuery;
-	global.jQuery = undefined;
+	// ............................... Hide QUnit global jQuery and any previous global jsrender.................................
+	var jQuery = global.jQuery, jsr = global.jsrender;
+	global.jQuery = global.jsrender = undefined;
 
 	// =============================== Arrange ===============================
 	var data = {name: "Jo"};
@@ -24,10 +26,11 @@ test("No jQuery global: require('jsrender')($)", function() {
 	result += " " + ($jsr !== jQuery);
 
 	// ............................... Assert .................................
-	equal(result, "Name: Jo (name-template.html) true", "result");
+	equal(result, "Name: Jo (name-template.html) true", "result: No jQuery global: require('jsrender')($)");
 
 	// ............................... Reset .................................
 	global.jQuery = jQuery; // Replace QUnit global jQuery
+	global.jsrender = jsr; // Replace any previous global jsrender
 });
 
 })();

test/browserify/3-unit-tests.js

@@ -2,12 +2,14 @@
 (function(undefined) {
 "use strict";
 
+browserify.done.three = true;
+
 QUnit.module("Browserify - client code");
 
 test("jQuery global: require('jsrender')", function() {
-	// ............................... Hide QUnit global jQuery .................................
-	var jQuery = global.jQuery;
-	global.jQuery = undefined;
+	// ............................... Hide QUnit global jQuery and any previous global jsrender.................................
+	var jQuery = global.jQuery, jsr = global.jsrender;
+	global.jQuery = global.jsrender = undefined;
 
 	// =============================== Arrange ===============================
 	var data = {name: "Jo"};
@@ -21,13 +23,14 @@ test("jQuery global: require('jsrender')", function() {
 
 	var result = tmpl(data);
 
-	result += " " + ($jsr !== jQuery);
+	result += " " + ($jsr !== jQuery) + " " + ($jsr === global.jQuery);
 
 	// ............................... Assert .................................
-	equal(result, "Name: Jo (name-template.html) true", "result");
+	equal(result, "Name: Jo (name-template.html) true true", "result: jQuery global: require('jsrender')");
 
 	// ............................... Reset .................................
 	global.jQuery = jQuery; // Replace QUnit global jQuery
+	global.jsrender = jsr; // Replace any previous global jsrender
 });
 
 })();

test/browserify/4-unit-tests.js

@@ -2,6 +2,8 @@
 (function(undefined) {
 "use strict";
 
+browserify.done.four = true;
+
 QUnit.module("Browserify - client code");
 
 test("No jQuery global: require('jquery.observable')", function() {
@@ -27,7 +29,7 @@ test("No jQuery global: require('jquery.observable')", function() {
 	result += " " + ($jsr !== jQuery && $jsr === $jq);
 
 	// ............................... Assert .................................
-	equal(result, " new name true", "result");
+	equal(result, " new name true", "result: No jQuery global: require('jquery.observable')");
 
 	// ............................... Reset .................................
 	global.jQuery = jQuery; // Replace QUnit global jQuery