Commit 73 (v0.9.73 - Beta)

Minor update: no important changes or bug fixes - Updated copyright and updated links to latest jQuery, QUnit etc. - Some documentation improvements New documentation topic on JsViews view object, and methods: http://www.jsviews.com/#jsvviewobject - view.refresh() - view.contents() - view.nodes() - view.childTags()
taoteg · Feb 16, 2016 · 2e00b5a · 2e00b5a
1 parent 0072edc
commit 2e00b5a
Show file tree

Hide file tree

Showing 28 changed files with 239 additions and 151 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 The content of this ***ReadMe*** is available also as a *[JsViews Quickstart](http://www.jsviews.com/#jsv-quickstart)*.
 
-<h3>Installation</h3>
+<h2>JsViews Installation</h2>
 
 jsviews.js is available from [downloads](http://www.jsviews.com/#download) on the jsviews.com site.
 
@@ -19,6 +19,8 @@ Alternatively:
 - It can be loaded using an AMD script loader, such as RequireJS
 - For installation using *Node.js* (*npm*) -- and browser loading using *Browserify* -- see *[JsRender Node.js Quickstart](http://www.jsviews.com/#jsr-node-quickstart)*
 
+*Example HTML page:* [Loading JsViews](http://www.jsviews.com/#download/pages-jsv)
+
 <h3>JsRender and JsViews</h3>
 **JsRender** is used for data-driven rendering of templates to strings, ready for insertion in the DOM. (See *[JsRender Quickstart](http://www.jsviews.com/#jsr-quickstart)* and [JsRender GitHub repository](https://github.com/BorisMoore/jsrender)).
 
@@ -240,7 +242,6 @@ $(".changeBtn").on("click", function() {
 
 [Learn more...](http://www.jsviews.com/#$view)
 
-
 <h3><i>Data-linked paths</i></h3>
 
 JsViews data-linked templates (and the `$.observe()` API) use the same [paths and expressions](http://www.jsviews.com/#paths) as JsRender templates, but in addition provide *'leaf'* data-binding -- such as:

diff --git a/jquery.observable.js b/jquery.observable.js
@@ -1,9 +1,9 @@
-/*! JsObservable v0.9.72 (Beta): http://jsviews.com/#jsobservable */
+/*! JsObservable v0.9.73 (Beta): http://jsviews.com/#jsobservable */
 /*
  * Subcomponent of JsViews
  * Data change events for data-linking
  *
- * Copyright 2015, Boris Moore
+ * Copyright 2016, Boris Moore
  * Released under the MIT License.
  */
 
@@ -44,7 +44,7 @@ if (!$ || !$.fn) {
 	throw "JsObservable requires jQuery"; // We require jQuery
 }
 
-var versionNumber = "v0.9.72",
+var versionNumber = "v0.9.73",
 	$observe, $observable,
 
 	$views = $.views =

diff --git a/jquery.observable.min.js b/jquery.observable.min.js
diff --git a/jquery.observable.min.js.map b/jquery.observable.min.js.map
diff --git a/jquery.views.js b/jquery.views.js
@@ -1,4 +1,4 @@
-/*! jquery.views.js v0.9.72 (Beta): http://jsviews.com/ */
+/*! jquery.views.js v0.9.73 (Beta): http://jsviews.com/ */
 /*
  * Interactive data-driven views using JsRender templates.
  * Subcomponent of JsViews
@@ -7,7 +7,7 @@
  * Also requires jquery.observable.js
  *   See JsObservable at http://jsviews.com/#download and http://github.com/BorisMoore/jsviews
  *
- * Copyright 2015, Boris Moore
+ * Copyright 2016, Boris Moore
  * Released under the MIT License.
  */
 
@@ -44,7 +44,7 @@ var global = (0, eval)('this'), // jshint ignore:line
 jsr = jsr || setGlobals && global.jsrender;
 $ = $ || global.jQuery;
 
-var versionNumber = "v0.9.72",
+var versionNumber = "v0.9.73",
 	requiresStr = "JsViews requires ";
 
 if (!$ || !$.fn) {
@@ -2267,7 +2267,7 @@ function addLinkMethods(tagOrView, isTag) {
 	tagOrView.contents = function(deep, select) {
 		// For a view or a tag, return jQuery object with the content nodes,
 		if (deep !== !!deep) {
-			// deep not boolean, so this is getContents(selector)
+			// deep not boolean, so this is contents(selector)
 			select = deep;
 			deep = undefined;
 		}
@@ -2374,6 +2374,7 @@ function addLinkMethods(tagOrView, isTag) {
 	};
 
 	if (isTag) {
+		// This is a TAG
 		tagOrView.domChange = function() { // domChange notification support
 			var elem = this.parentElem,
 				hasListener = $.hasData(elem) && $._data(elem).events,
@@ -2385,7 +2386,8 @@ function addLinkMethods(tagOrView, isTag) {
 			}
 		};
 	} else {
-			// Note: a linked view will also, after linking have nodes[], _prv (prevNode), _nxt (nextNode) ...
+		// This is a VIEW
+		// Note: a linked view will also, after linking have nodes[], _prv (prevNode), _nxt (nextNode) ...
 		tagOrView.addViews = function(index, dataItems, tmpl) {
 			// if view is not an array view, do nothing
 			var i, viewsCount,
@@ -2511,12 +2513,12 @@ function addLinkMethods(tagOrView, isTag) {
 			return this;
 		};
 
-		tagOrView.refresh = function(context) {
+		tagOrView.refresh = function() {
 			var self = this,
 				parent = self.parent;
 
 			if (parent) {
-				renderAndLink(self, self.index, self.tmpl, parent.views, self.data, context, true);
+				renderAndLink(self, self.index, self.tmpl, parent.views, self.data, undefined, true);
 				setArrayChangeLink(self);
 			}
 			return self;

diff --git a/jquery.views.min.js b/jquery.views.min.js
diff --git a/jquery.views.min.js.map b/jquery.views.min.js.map
diff --git a/jsrender.js b/jsrender.js
@@ -1,11 +1,11 @@
-/*! JsRender v0.9.72 (Beta): http://jsviews.com/#jsrender */
+/*! JsRender v0.9.73 (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.
  * Does not require jQuery, or HTML DOM
  * Integrates with JsViews (http://jsviews.com/#jsviews)
  *
- * Copyright 2015, Boris Moore
+ * Copyright 2016, Boris Moore
  * Released under the MIT License.
  */
 
@@ -32,7 +32,7 @@
 	}
 } (
 
-// factory (for jquery.views.js)
+// factory (for jsrender.js)
 function($) {
 "use strict";
 
@@ -44,7 +44,7 @@ var global = (0, eval)('this'), // jshint ignore:line
 
 $ = $ && $.fn ? $ : global.jQuery; // $ is jQuery passed in by CommonJS loader (Browserify), or global jQuery.
 
-var versionNumber = "v0.9.72",
+var versionNumber = "v0.9.73",
 	jsvStoreName, rTag, rTmplString, topView, $views,
 
 //TODO	tmplFnsCache = {},
@@ -235,10 +235,10 @@ function $viewsDelimiters(openChars, closeChars, link) {
 		// make rTag available to JsViews (or other components) for parsing binding expressions
 		$sub.rTag = "(?:" + rTag + ")";
 		//                        { ^? {   tag+params slash?  or closingTag                                                   or comment
-		rTag = new RegExp("(?:" + openChars + rTag + "(\\/)?|\\" + delimOpenChar0 + "\\" + delimOpenChar1 + "(?:(?:\\/(\\w+))\\s*|!--[\\s\\S]*?--))" + closeChars, "g");
+		rTag = new RegExp("(?:" + openChars + rTag + "(\\/)?|\\" + delimOpenChar0 + "(\\" + linkChar + ")?\\" + delimOpenChar1 + "(?:(?:\\/(\\w+))\\s*|!--[\\s\\S]*?--))" + closeChars, "g");
 
-		// Default:  bind     tagName         cvt   cln html code   params             slash           closeBlk  comment
-		//      /(?:{(\^)?{(?:(\w+(?=[/\s}]))|(\w+)?(:)|(>)|(\*))\s*((?:[^}]|}(?!}))*?)(\/)?|{{(?:(?:\/(\w+))|!--[\s\S]*?--))}}/g
+		// Default:  bind     tagName         cvt   cln html code    params            slash   bind2         closeBlk  comment
+		//      /(?:{(\^)?{(?:(\w+(?=[\/\s}]))|(\w+)?(:)|(>)|(\*))\s*((?:[^}]|}(?!}))*?)(\/)?|{(\^)?{(?:(?:\/(\w+))\s*|!--[\s\S]*?--))}}
 
 		rTmplString = new RegExp("<.*>|([^\\\\]|^)[{}]|" + openChars + ".*" + closeChars);
 		// rTmplString looks for html tags or { or } char not preceded by \\, or JsRender tags {{xxx}}. Each of these strings are considered
@@ -1224,43 +1224,43 @@ function tmplFn(markup, tmpl, isLinkExpr, convertBack, hasElse) {
 		}
 	}
 
-	function parseTag(all, bind, tagName, converter, colon, html, codeTag, params, slash, closeBlock, index) {
+	function parseTag(all, bind, tagName, converter, colon, html, codeTag, params, slash, bind2, closeBlock, index) {
 /*
 
-     bind     tagName         cvt   cln html code   params             slash           closeBlk  comment
-/(?:{(\^)?{(?:(\w+(?=[/\s}]))|(\w+)?(:)|(>)|(\*))\s*((?:[^}]|}(?!}))*?)(\/)?|{{(?:(?:\/(\w+))|!--[\s\S]*?--))}}/g
+     bind     tagName         cvt   cln html code    params            slash   bind2         closeBlk  comment
+/(?:{(\^)?{(?:(\w+(?=[\/\s}]))|(\w+)?(:)|(>)|(\*))\s*((?:[^}]|}(?!}))*?)(\/)?|{(\^)?{(?:(?:\/(\w+))\s*|!--[\s\S]*?--))}}/g
 
 (?:
-  {(\^)?{				bind
+  {(\^)?{            bind
   (?:
-    (\w+				tagName
+    (\w+             tagName
       (?=[\/\s}])
     )
     |
-    (\w+)?(:)			converter colon
+    (\w+)?(:)        converter colon
     |
-    (>)					html
+    (>)              html
     |
-    (\*)				codeTag
+    (\*)             codeTag
   )
   \s*
-  (						params
+  (                  params
     (?:[^}]|}(?!}))*?
   )
-  (\/)?					slash
+  (\/)?              slash
   |
-  {{
+  {(\^)?{            bind2
   (?:
-    (?:\/(\w+))			closeBlock
+    (?:\/(\w+))\s*   closeBlock
     |
-    !--[\s\S]*?--		comment
+    !--[\s\S]*?--    comment
   )
 )
 }}/g
 
 */
 
-		if (codeTag && bind || slash && !tagName || params && params.slice(-1) === ":") {
+		if (codeTag && bind || slash && !tagName || params && params.slice(-1) === ":" || bind2) {
 			syntaxError(all);
 		}
 

diff --git a/jsrender.min.js b/jsrender.min.js
diff --git a/jsrender.min.js.map b/jsrender.min.js.map
diff --git a/jsviews.js b/jsviews.js
@@ -1,12 +1,12 @@
-/*! jsviews.js v0.9.72 (Beta) single-file version: http://jsviews.com/ */
+/*! jsviews.js v0.9.73 (Beta) single-file version: http://jsviews.com/ */
 /*! includes JsRender, JsObservable and JsViews - see: http://jsviews.com/#download */
 
 /* Interactive data-driven views using JsRender templates */
 
 //<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< JsRender >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 /* JsRender:
  * See http://jsviews.com/#jsrender and http://github.com/BorisMoore/jsrender
- * Copyright 2015, Boris Moore
+ * Copyright 2016, Boris Moore
  * Released under the MIT License.
  */
 
@@ -47,7 +47,7 @@ if (!$ || !$.fn) {
 	throw "JsViews requires jQuery"; // We require jQuery
 }
 
-var versionNumber = "v0.9.72",
+var versionNumber = "v0.9.73",
 
 	jsvStoreName, rTag, rTmplString, topView, $views, $observe, $observable,
 
@@ -239,10 +239,10 @@ function $viewsDelimiters(openChars, closeChars, link) {
 		// make rTag available to JsViews (or other components) for parsing binding expressions
 		$sub.rTag = "(?:" + rTag + ")";
 		//                        { ^? {   tag+params slash?  or closingTag                                                   or comment
-		rTag = new RegExp("(?:" + openChars + rTag + "(\\/)?|\\" + delimOpenChar0 + "\\" + delimOpenChar1 + "(?:(?:\\/(\\w+))\\s*|!--[\\s\\S]*?--))" + closeChars, "g");
+		rTag = new RegExp("(?:" + openChars + rTag + "(\\/)?|\\" + delimOpenChar0 + "(\\" + linkChar + ")?\\" + delimOpenChar1 + "(?:(?:\\/(\\w+))\\s*|!--[\\s\\S]*?--))" + closeChars, "g");
 
-		// Default:  bind     tagName         cvt   cln html code   params             slash           closeBlk  comment
-		//      /(?:{(\^)?{(?:(\w+(?=[/\s}]))|(\w+)?(:)|(>)|(\*))\s*((?:[^}]|}(?!}))*?)(\/)?|{{(?:(?:\/(\w+))|!--[\s\S]*?--))}}/g
+		// Default:  bind     tagName         cvt   cln html code    params            slash   bind2         closeBlk  comment
+		//      /(?:{(\^)?{(?:(\w+(?=[\/\s}]))|(\w+)?(:)|(>)|(\*))\s*((?:[^}]|}(?!}))*?)(\/)?|{(\^)?{(?:(?:\/(\w+))\s*|!--[\s\S]*?--))}}
 
 		rTmplString = new RegExp("<.*>|([^\\\\]|^)[{}]|" + openChars + ".*" + closeChars);
 		// rTmplString looks for html tags or { or } char not preceded by \\, or JsRender tags {{xxx}}. Each of these strings are considered
@@ -1228,43 +1228,43 @@ function tmplFn(markup, tmpl, isLinkExpr, convertBack, hasElse) {
 		}
 	}
 
-	function parseTag(all, bind, tagName, converter, colon, html, codeTag, params, slash, closeBlock, index) {
+	function parseTag(all, bind, tagName, converter, colon, html, codeTag, params, slash, bind2, closeBlock, index) {
 /*
 
-     bind     tagName         cvt   cln html code   params             slash           closeBlk  comment
-/(?:{(\^)?{(?:(\w+(?=[/\s}]))|(\w+)?(:)|(>)|(\*))\s*((?:[^}]|}(?!}))*?)(\/)?|{{(?:(?:\/(\w+))|!--[\s\S]*?--))}}/g
+     bind     tagName         cvt   cln html code    params            slash   bind2         closeBlk  comment
+/(?:{(\^)?{(?:(\w+(?=[\/\s}]))|(\w+)?(:)|(>)|(\*))\s*((?:[^}]|}(?!}))*?)(\/)?|{(\^)?{(?:(?:\/(\w+))\s*|!--[\s\S]*?--))}}/g
 
 (?:
-  {(\^)?{				bind
+  {(\^)?{            bind
   (?:
-    (\w+				tagName
+    (\w+             tagName
       (?=[\/\s}])
     )
     |
-    (\w+)?(:)			converter colon
+    (\w+)?(:)        converter colon
     |
-    (>)					html
+    (>)              html
     |
-    (\*)				codeTag
+    (\*)             codeTag
   )
   \s*
-  (						params
+  (                  params
     (?:[^}]|}(?!}))*?
   )
-  (\/)?					slash
+  (\/)?              slash
   |
-  {{
+  {(\^)?{            bind2
   (?:
-    (?:\/(\w+))			closeBlock
+    (?:\/(\w+))\s*   closeBlock
     |
-    !--[\s\S]*?--		comment
+    !--[\s\S]*?--    comment
   )
 )
 }}/g
 
 */
 
-		if (codeTag && bind || slash && !tagName || params && params.slice(-1) === ":") {
+		if (codeTag && bind || slash && !tagName || params && params.slice(-1) === ":" || bind2) {
 			syntaxError(all);
 		}
 
@@ -2034,7 +2034,7 @@ if (jsrToJq) { // Moving from jsrender namespace to jQuery namepace - copy over
 //<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< JsObservable >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 /* JsObservable:
  * See http://www.jsviews.com/#jsobservable and http://github.com/borismoore/jsviews
- * Copyright 2015, Boris Moore
+ * Copyright 2016, Boris Moore
  * Released under the MIT License.
  */
 
@@ -3004,7 +3004,7 @@ if (!$.observe) {
 /* JsViews:
  * Interactive data-driven views using templates and data-linking.
  * See http://www.jsviews.com/#jsviews and http://github.com/BorisMoore/jsviews
- * Copyright 2015, Boris Moore
+ * Copyright 2016, Boris Moore
  * Released under the MIT License.
  */
 
@@ -5200,7 +5200,7 @@ function addLinkMethods(tagOrView, isTag) {
 	tagOrView.contents = function(deep, select) {
 		// For a view or a tag, return jQuery object with the content nodes,
 		if (deep !== !!deep) {
-			// deep not boolean, so this is getContents(selector)
+			// deep not boolean, so this is contents(selector)
 			select = deep;
 			deep = undefined;
 		}
@@ -5318,7 +5318,8 @@ function addLinkMethods(tagOrView, isTag) {
 			}
 		};
 	} else {
-			// Note: a linked view will also, after linking have nodes[], _prv (prevNode), _nxt (nextNode) ...
+		// This is a view
+		// Note: a linked view will also, after linking have nodes[], _prv (prevNode), _nxt (nextNode) ...
 		tagOrView.addViews = function(index, dataItems, tmpl) {
 			// if view is not an array view, do nothing
 			var i, viewsCount,
@@ -5444,12 +5445,12 @@ function addLinkMethods(tagOrView, isTag) {
 			return this;
 		};
 
-		tagOrView.refresh = function(context) {
+		tagOrView.refresh = function() {
 			var self = this,
 				parent = self.parent;
 
 			if (parent) {
-				renderAndLink(self, self.index, self.tmpl, parent.views, self.data, context, true);
+				renderAndLink(self, self.index, self.tmpl, parent.views, self.data, undefined, true);
 				setArrayChangeLink(self);
 			}
 			return self;

diff --git a/jsviews.min.js b/jsviews.min.js
diff --git a/jsviews.min.js.map b/jsviews.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsviews",
-  "version": "v0.9.72",
+  "version": "v0.9.73",
   "description": "Next-generation MVVM and MVP framework - built on top of JsRender templates. Bringing templates to life...",
   "main": "./jsviews.js",
   "author": {
@@ -33,7 +33,7 @@
     "glob-stream": "^5.0.0",
     "gulp": "^3.9.0",
     "jquery": "^2.1.4",
-    "jsrender": "^0.9.72",
+    "jsrender": "^0.9.73",
     "qunit": "^0.7.6"
   },
   "dependencies": {}