Skip to content

Commit f984e13

Browse files
committed
Commit 74 (v0.9.74 - Beta)
Updates and new documentation topics: - Important updates and improvements to $.views.settings APIs: settings.allowCode(), settings.delimiters(), settings.debugMode() plus new settings.advanced(). See new documentation at www.jsviews.com/#settings - Support for error handling and debugging improved and extended, with some small changes to APIs - including for $.views.settings.debugMode, with full documention at www.jsviews.com/#onerror - {{>}} is now equivalent to {{>#data}} Minor breaking changes: - JsRender no longer uses the (0, eval)('this') expression to get the window object. This means that it can now be minified by the Visual Studio minifier, in spite of it not correctly minifying this expression. See BorisMoore/jsviews#323 Bug fixes: - Several small bug fixes - This update also includes a security fix
1 parent 11ebdd8 commit f984e13

File tree

9 files changed

+418
-299
lines changed

9 files changed

+418
-299
lines changed

jsrender-node.js

Lines changed: 133 additions & 97 deletions
Large diffs are not rendered by default.

jsrender.js

Lines changed: 142 additions & 105 deletions
Large diffs are not rendered by default.

jsrender.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jsrender.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsrender",
3-
"version": "v0.9.73",
3+
"version": "v0.9.74",
44
"description": "Best-of-breed templating in browser or on Node.js (with Express 4, Hapi and Browserify integration)",
55
"main": "./jsrender-node.js",
66
"browser": "./jsrender.js",

test/perf-compare.html

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,6 @@ <h3>Perf comparison</h3>
120120
ret = tmpl_JsRender.render( movie );
121121
});
122122

123-
test( "JsRender: Debug mode off - <em>$.views.settings.debugMode(false)</em>", times * 500, 1,
124-
function() {
125-
ret = tmpl_JsRender.render( movie );
126-
},
127-
function() {
128-
$.views.settings.debugMode(false);
129-
},
130-
function() {
131-
$.views.settings.debugMode(true);
132-
}
133-
);
134-
135123
// Test html encoding perf
136124
$( "#results" ).append( "<tr><td colspan='2'>________________________________________________________</td></tr>" );
137125
$( "#results" ).append( "<tr><td colspan='2'><b>Render to string, with HTML encoding</b></td></tr>");
@@ -157,18 +145,6 @@ <h3>Perf comparison</h3>
157145
ret = tmpl_JsRenderEncode.render( movie );
158146
});
159147

160-
test( "JsRender: Debug mode off - <em>$.views.settings.debugMode(false)</em>", times * 50, 1,
161-
function() {
162-
ret = tmpl_JsRenderEncode.render( movie );
163-
},
164-
function() {
165-
$.views.settings.debugMode(false);
166-
},
167-
function() {
168-
$.views.settings.debugMode(true);
169-
}
170-
);
171-
172148
// Test full features perf
173149
$( "#results" ).append( "<tr><td colspan='2'>________________________________________________________</td></tr>" );
174150
$( "#results" ).append( "<tr><td colspan='2'><b>Render and insert in DOM</b></td></tr>");

test/unit-tests/tests-jsrender-no-jquery.js

Lines changed: 133 additions & 63 deletions
Large diffs are not rendered by default.

test/unit-tests/tests-jsrender-with-jquery.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var person = { name: "Jo" },
2222
people = [{ name: "Jo" },{ name: "Bill" }],
2323
towns = [{ name: "Seattle" },{ name: "Paris" },{ name: "Delhi" }];
2424

25-
var tmplString = "A_{{:name}}_B";
25+
var tmplString = "A_{{:name}}_B";
2626

2727
module("api");
2828

@@ -102,7 +102,7 @@ test("templates", function() {
102102
equal($.render.my_tmpl(person), "A_Jo_B", 'Compile a template and then render it: $.templates("my_tmpl", tmplString); $.render.my_tmpl(data);');
103103

104104
$.templates({ myTmpl2: tmplString });
105-
equal($.render.myTmpl2(person), "A_Jo_B", 'Compile and register templates: $.templates({ "my_tmpl", tmplString, ... }); $.render.my_tmpl(data);');
105+
equal($.render.myTmpl2(person), "A_Jo_B", 'Compile and register templates: $.templates({ "my_tmpl", tmplString, ... }); $.render.my_tmpl(data);');
106106

107107
equal($.templates.myTmpl2.render(person), "A_Jo_B", 'Get named template: $.templates.my_tmpl.render(data);');
108108

@@ -149,7 +149,7 @@ test("templates", function() {
149149
ok($.templates.cloned2 !== tmpl2 && $.templates.cloned2.tmplName === "cloned2", '$.templates({ cloned: {markup: "#my_tmpl" } }) will clone the cached template');
150150

151151
$.templates("my_tmpl", null);
152-
equal($.templates.my_tmpl, undefined, 'Remove a named template: $.templates("my_tmpl", null);');
152+
equal($.templates.my_tmpl, undefined, 'Remove a named template: $.templates("my_tmpl", null);');
153153

154154
$.templates({
155155
"scriptTmpl": {
@@ -161,7 +161,7 @@ test("templates", function() {
161161
debug:true
162162
}
163163
});
164-
equal($.templates.tmplFromString.fn.toString().indexOf("debugger;") > 0 && $.templates.scriptTmpl.fn.toString().indexOf("debugger;") > 0, true, 'Debug a template: set debug:true on object');
164+
equal($.templates.tmplFromString.fn.toString().indexOf("debugger;") > 0 && $.templates.scriptTmpl.fn.toString().indexOf("debugger;") > 0, true, 'Debug a template: set debug:true on object');
165165

166166
// reset
167167
$("#my_tmpl")[0].removeAttribute("data-jsv-tmpl");
@@ -234,7 +234,7 @@ test("helpers", 3, function() {
234234
equal($.views.helpers.concat === concat, true, 'concatFunction === $.views.helpers.concat');
235235

236236
$.views.helpers("concat2", null);
237-
equal($.views.helpers.concat2, undefined, 'Remove a registered helper: $.views.helpers({ concat: null })');
237+
equal($.views.helpers.concat2, undefined, 'Remove a registered helper: $.views.helpers({ concat: null })');
238238
});
239239

240240
test("template encapsulation", 1, function() {

tmplify/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! JsRender tmplify submodule v0.9.73 (Beta): http://jsviews.com/#jsrender */
1+
/*! JsRender tmplify submodule v0.9.74 (Beta): http://jsviews.com/#jsrender */
22
/*! Browserify transform for JsRender templates */
33
/*
44
* Copyright 2016, Boris Moore

0 commit comments

Comments
 (0)