v1.0.4 release

Minor bug fixes: - BorisMoore/jsviews#424 (itemVar is not created on new items in observable array) - BorisMoore/jsviews#423 (memory leak issues)
BorisMoore · Aug 3, 2019 · 175976c · 175976c
1 parent 5b746b2
commit 175976c
Show file tree

Hide file tree

Showing 41 changed files with 247 additions and 255 deletions.
diff --git a/demos/scenarios/01_default-values-scenario.html b/demos/scenarios/01_default-values-scenario.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/scenarios/02_separators-scenario.html b/demos/scenarios/02_separators-scenario.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jquery-1.8.0.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />

diff --git a/demos/scenarios/03_iterating-through-fields-scenario.html b/demos/scenarios/03_iterating-through-fields-scenario.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/scenarios/04_assigning-variables-scenario.html b/demos/scenarios/04_assigning-variables-scenario.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/scenarios/05_arrays-plus-headers-and-footers.html b/demos/scenarios/05_arrays-plus-headers-and-footers.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/01_inserting-data.html b/demos/step-by-step/01_inserting-data.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 </head>

diff --git a/demos/step-by-step/02_compiling-named-templates-from-strings.html b/demos/step-by-step/02_compiling-named-templates-from-strings.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/03_converters-and-encoding.html b/demos/step-by-step/03_converters-and-encoding.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/04_if-else-tag.html b/demos/step-by-step/04_if-else-tag.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/05_for-tag.html b/demos/step-by-step/05_for-tag.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/06_template-composition.html b/demos/step-by-step/06_template-composition.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/07_paths.html b/demos/step-by-step/07_paths.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
  	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 </head>

diff --git a/demos/step-by-step/08_custom-tags.html b/demos/step-by-step/08_custom-tags.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/09_helper-functions.html b/demos/step-by-step/09_helper-functions.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/10_comparison-tests.html b/demos/step-by-step/10_comparison-tests.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/11_accessing-parent-data.html b/demos/step-by-step/11_accessing-parent-data.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/12_passing-in-context.html b/demos/step-by-step/12_passing-in-context.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/step-by-step/13_associating-helpers-with-templates.html b/demos/step-by-step/13_associating-helpers-with-templates.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../jsrender.js" type="text/javascript"></script>
 	<link href="../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/variants/accessing-templates/01_compiling-template-objects-from-strings.html b/demos/variants/accessing-templates/01_compiling-template-objects-from-strings.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../../jsrender.js" type="text/javascript"></script>
 	<link href="../../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/...s/variants/accessing-templates/02_registering-named-template-from-script-declaration.html b/...s/variants/accessing-templates/02_registering-named-template-from-script-declaration.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../../jsrender.js" type="text/javascript"></script>
 	<link href="../../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/variants/accessing-templates/03_getting-template-objects-from-script-declaration.html b/demos/variants/accessing-templates/03_getting-template-objects-from-script-declaration.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../../jsrender.js" type="text/javascript"></script>
 	<link href="../../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/variants/accessing-templates/04_template-composition-subtemplates.html b/demos/variants/accessing-templates/04_template-composition-subtemplates.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../../jsrender.js" type="text/javascript"></script>
 	<link href="../../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/demos/variants/accessing-templates/05_template-composition-templateobjects.html b/demos/variants/accessing-templates/05_template-composition-templateobjects.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="http://code.jquery.com/jquery-1.11.2.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-3.4.1.js" type="text/javascript"></script>
 	<script src="../../../jsrender.js" type="text/javascript"></script>
 	<link href="../../resources/demos.css" rel="stylesheet" type="text/css" />
 

diff --git a/jsrender-node.js b/jsrender-node.js
@@ -1,4 +1,4 @@
-/*! JsRender v1.0.3: http://jsviews.com/#jsrender */
+/*! JsRender v1.0.4: http://jsviews.com/#jsrender */
 /*! **VERSION FOR NODE.JS** (For WEB see http://jsviews.com/download/jsrender.js) */
 /*
  * Best-of-breed templating in browser or on Node.js.
@@ -19,7 +19,7 @@ if (typeof exports !== 'object' ) {
 
 //========================== Top-level vars ==========================
 
-var versionNumber = "v1.0.3",
+var versionNumber = "v1.0.4",
 
 	// global var is the this object, which is window when running in the usual browser environment
 
@@ -395,7 +395,7 @@ function contextParameter(key, value, get) {
 		callView = storeView;
 		if (store && store.hasOwnProperty(key) || (store = $helpers).hasOwnProperty(key)) {
 			res = store[key];
-			if (key === "tag" || key === "tagCtx" || key === "root" || key === "parentTags" || storeView._.it === key ) {
+			if (key === "tag" || key === "tagCtx" || key === "root" || key === "parentTags") {
 				return res;
 			}
 		} else {
@@ -940,6 +940,11 @@ function View(context, type, parentView, data, template, key, onRender, contentT
 	};
 	self.linked = !!onRender;
 	self.type = type || "top";
+
+	if (!parentView || parentView.type === "top") {
+		(self.ctx = context || {}).root = self.data;
+	}
+
 	if (self.parent = parentView) {
 		self.root = parentView.root || self; // view whose parent is top view
 		views = parentView.views;
@@ -961,11 +966,8 @@ function View(context, type, parentView, data, template, key, onRender, contentT
 		// If no context was passed in, use parent context
 		// If context was passed in, it should have been merged already with parent context
 		self.ctx = context || parentView.ctx;
-	} else {
-		self.ctx = context || {};
-		if (type) {
-			self.root = self; // view whose parent is top view
-		}
+	} else if (type) {
+		self.root = self; // view whose parent is top view
 	}
 }
 
@@ -1674,12 +1676,6 @@ function renderContent(data, context, noIteration, parentView, key, onRender) {
 }
 
 function renderWithViews(tmpl, data, context, noIteration, view, key, onRender, tag) {
-	function setItemVar(item) {
-		// When itemVar is specified, set modified ctx with user-named ~item
-		newCtx = $extend({}, context);
-		newCtx[itemVar] = item;
-	}
-
 	// Render template against data as a tree of subviews (nested rendered template instances), or as a string (top-level template).
 	// If the data is the parent view, treat as noIteration, re-render with the same data context.
 	// tmpl can be a string (e.g. rendered by a tag.render() method), or a compiled template.
@@ -1714,12 +1710,6 @@ function renderWithViews(tmpl, data, context, noIteration, view, key, onRender,
 			context = context || {};
 			context.link = false;
 		}
-		if (itemVar = tagCtx.props.itemVar) {
-			if (itemVar[0] !== "~") {
-				syntaxError("Use itemVar='~myItem'");
-			}
-			itemVar = itemVar.slice(1);
-		}
 	}
 
 	if (view) {
@@ -1731,6 +1721,16 @@ function renderWithViews(tmpl, data, context, noIteration, view, key, onRender,
 		}
 
 		context = extendCtx(context, view.ctx);
+		tagCtx = !tag && view.tag
+			? view.tag.tagCtxs[view.tagElse]
+			: tagCtx;
+	}
+
+	if (itemVar = tagCtx && tagCtx.props.itemVar) {
+		if (itemVar[0] !== "~") {
+			syntaxError("Use itemVar='~myItem'");
+		}
+		itemVar = itemVar.slice(1);
 	}
 
 	if (key === true) {
@@ -1770,23 +1770,22 @@ function renderWithViews(tmpl, data, context, noIteration, view, key, onRender,
 		}
 		for (i = 0, l = data.length; i < l; i++) {
 			// Create a view for each data item.
+			childView = new View(newCtx, "item", newView, data[i], tmpl, (key || 0) + i, onRender, newView.content);
 			if (itemVar) {
-				setItemVar(data[i]); // use modified ctx with user-named ~item
+				(childView.ctx = $extend({}, newCtx))[itemVar] = $sub._cp(data[i], "#data", childView);
 			}
-			childView = new View(newCtx, "item", newView, data[i], tmpl, (key || 0) + i, onRender, newView.content);
-			childView._.it = itemVar;
-
 			itemResult = tmpl.fn(data[i], childView, $sub);
 			result += newView._.onRender ? newView._.onRender(itemResult, childView) : itemResult;
 		}
 	} else {
 		// Create a view for singleton data object. The type of the view will be the tag name, e.g. "if" or "mytag" except for
 		// "item", "array" and "data" views. A "data" view is from programmatic render(object) against a 'singleton'.
+		newView = swapContent ? view : new View(newCtx, tmplName || "data", view, data, tmpl, key, onRender, contentTmpl);
+
 		if (itemVar) {
-			setItemVar(data);
+			(newView.ctx = $extend({}, newCtx))[itemVar] = $sub._cp(data, "#data", newView);
 		}
-		newView = swapContent ? view : new View(newCtx, tmplName || "data", view, data, tmpl, key, onRender, contentTmpl);
-		newView._.it = itemVar;
+
 		newView.tag = tag;
 		newView._.nl = noLinking;
 		result += tmpl.fn(data, newView, $sub);