Skip to content

Commit

Permalink
v1.0.10 release
Browse files Browse the repository at this point in the history
Sync with changes in v1.0.10 for JsViews
Minor bug fixes
  • Loading branch information
BorisMoore committed Jan 10, 2021
1 parent ad2a627 commit 645902a
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 35 deletions.
9 changes: 5 additions & 4 deletions jsrender-node.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*! JsRender v1.0.9: http://jsviews.com/#jsrender */
/*! JsRender v1.0.10: 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.
* Does not require jQuery, or HTML DOM
* Integrates with JsViews (http://jsviews.com/#jsviews)
*
* Copyright 2020, Boris Moore
* Copyright 2021, Boris Moore
* Released under the MIT License.
*/

Expand All @@ -20,7 +20,7 @@ if (typeof exports !== 'object' ) {
//========================== Top-level vars ==========================

// global var is the this object, which is window when running in the usual browser environment
var versionNumber = "v1.0.9",
var versionNumber = "v1.0.10",
$, jsvStoreName, rTag, rTmplString, topView, $views,
_ocp = "_ocp", // Observable contextual parameter

Expand Down Expand Up @@ -2181,7 +2181,8 @@ function parseParams(params, pathBindings, tmpl, isLinkExpr) {
}
if (rtPrnDot && bindings) {
// This is a binding to a path in which an object is returned by a helper/data function/expression, e.g. foo()^x.y or (a?b:c)^x.y
// We create a compiled function to get the object instance (which will be called when the dependent data of the subexpression changes, to return the new object, and trigger re-binding of the subsequent path)
// We create a compiled function to get the object instance (which will be called when the dependent data of the subexpression changes,
// to return the new object, and trigger re-binding of the subsequent path)
expr = pathStart[fnDp-1];
if (full.length - 1 > ind - (expr || 0)) { // We need to compile a subexpression
expr = $.trim(full.slice(expr, ind + all.length));
Expand Down
9 changes: 5 additions & 4 deletions jsrender.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*! JsRender v1.0.9: http://jsviews.com/#jsrender */
/*! JsRender v1.0.10: 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 2020, Boris Moore
* Copyright 2021, Boris Moore
* Released under the MIT License.
*/

Expand Down Expand Up @@ -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 = "v1.0.9",
var versionNumber = "v1.0.10",
jsvStoreName, rTag, rTmplString, topView, $views, $expando,
_ocp = "_ocp", // Observable contextual parameter

Expand Down Expand Up @@ -2231,7 +2231,8 @@ function parseParams(params, pathBindings, tmpl, isLinkExpr) {
}
if (rtPrnDot && bindings) {
// This is a binding to a path in which an object is returned by a helper/data function/expression, e.g. foo()^x.y or (a?b:c)^x.y
// We create a compiled function to get the object instance (which will be called when the dependent data of the subexpression changes, to return the new object, and trigger re-binding of the subsequent path)
// We create a compiled function to get the object instance (which will be called when the dependent data of the subexpression changes,
// to return the new object, and trigger re-binding of the subsequent path)
expr = pathStart[fnDp-1];
if (full.length - 1 > ind - (expr || 0)) { // We need to compile a subexpression
expr = $.trim(full.slice(expr, ind + all.length));
Expand Down
4 changes: 2 additions & 2 deletions jsrender.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jsrender.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsrender",
"version": "v1.0.9",
"version": "v1.0.10",
"description": "Best-of-breed templating in browser or on Node.js (with Express 4, Hapi and Browserify integration)",
"main": "./jsrender-node.js",
"browser": "./jsrender.js",
Expand Down
9 changes: 5 additions & 4 deletions test/browserify/bundles/1-bundle.js

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions test/browserify/bundles/12-nested-bundle.js

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions test/browserify/bundles/2-bundle.js

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions test/browserify/bundles/3-bundle.js

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions test/browserify/bundles/htm-jsrender-tmpl-bundle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
/*! JsRender v1.0.9: http://jsviews.com/#jsrender */
/*! JsRender v1.0.10: 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.
Expand Down Expand Up @@ -45,7 +45,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 = "v1.0.9",
var versionNumber = "v1.0.10",
jsvStoreName, rTag, rTmplString, topView, $views, $expando,
_ocp = "_ocp", // Observable contextual parameter

Expand Down Expand Up @@ -2232,7 +2232,8 @@ function parseParams(params, pathBindings, tmpl, isLinkExpr) {
}
if (rtPrnDot && bindings) {
// This is a binding to a path in which an object is returned by a helper/data function/expression, e.g. foo()^x.y or (a?b:c)^x.y
// We create a compiled function to get the object instance (which will be called when the dependent data of the subexpression changes, to return the new object, and trigger re-binding of the subsequent path)
// We create a compiled function to get the object instance (which will be called when the dependent data of the subexpression changes,
// to return the new object, and trigger re-binding of the subsequent path)
expr = pathStart[fnDp-1];
if (full.length - 1 > ind - (expr || 0)) { // We need to compile a subexpression
expr = $.trim(full.slice(expr, ind + all.length));
Expand Down
7 changes: 4 additions & 3 deletions test/browserify/bundles/html-jsr-tmpl-bundle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
/*! JsRender v1.0.9: http://jsviews.com/#jsrender */
/*! JsRender v1.0.10: 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.
Expand Down Expand Up @@ -45,7 +45,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 = "v1.0.9",
var versionNumber = "v1.0.10",
jsvStoreName, rTag, rTmplString, topView, $views, $expando,
_ocp = "_ocp", // Observable contextual parameter

Expand Down Expand Up @@ -2232,7 +2232,8 @@ function parseParams(params, pathBindings, tmpl, isLinkExpr) {
}
if (rtPrnDot && bindings) {
// This is a binding to a path in which an object is returned by a helper/data function/expression, e.g. foo()^x.y or (a?b:c)^x.y
// We create a compiled function to get the object instance (which will be called when the dependent data of the subexpression changes, to return the new object, and trigger re-binding of the subsequent path)
// We create a compiled function to get the object instance (which will be called when the dependent data of the subexpression changes,
// to return the new object, and trigger re-binding of the subsequent path)
expr = pathStart[fnDp-1];
if (full.length - 1 > ind - (expr || 0)) { // We need to compile a subexpression
expr = $.trim(full.slice(expr, ind + all.length));
Expand Down
2 changes: 1 addition & 1 deletion typescript/jsrender/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Type definitions for JsRender 1.0
// Version: "v1.0.9"
// Version: "v1.0.10"
// Project: http://www.jsviews.com/#jsrender
// Definitions by: Boris Moore <https://github.com/borismoore>
// Definitions: https://www.jsviews.com/download/typescript/jsrender/index.d.ts
Expand Down

0 comments on commit 645902a

Please sign in to comment.