Skip to content

Commit 8d17184

Browse files
committed
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
1 parent de0fd3f commit 8d17184

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+143149
-208
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
**/.*
22
node_modules
33
bower_components
4-
test/browserify/bundles/*.js
54
*.config
65
Scripts

jquery.observable.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! JsObservable v0.9.74 (Beta): http://jsviews.com/#jsobservable */
1+
/*! JsObservable v0.9.75 (Beta): http://jsviews.com/#jsobservable */
22
/*
33
* Subcomponent of JsViews
44
* Data change events for data-linking
@@ -13,16 +13,16 @@
1313
// global var is the this object, which is window when running in the usual browser environment
1414
var $ = global.jQuery;
1515

16-
if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
17-
define(["jquery"], function($) {
18-
return factory(global, $); // Require jQuery
19-
});
20-
} else if (typeof exports === "object") { // CommonJS e.g. Browserify
16+
if (typeof exports === "object") { // CommonJS e.g. Browserify
2117
module.exports = $
2218
? factory(global, $)
2319
: function($) { // If no global jQuery, take jQuery passed as parameter: require("jsobservable")(jQuery)
2420
return factory(global, $);
2521
};
22+
} else if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
23+
define(["jquery"], function($) {
24+
return factory(global, $); // Require jQuery
25+
});
2626
} else { // Browser using plain <script> tag
2727
factory(global, false);
2828
}
@@ -1073,4 +1073,4 @@ if (!$.observe) {
10731073
}
10741074

10751075
return $;
1076-
}, this));
1076+
}, window));

jquery.observable.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.

jquery.observable.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.

jquery.views.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! jquery.views.js v0.9.74 (Beta): http://jsviews.com/ */
1+
/*! jquery.views.js v0.9.75 (Beta): http://jsviews.com/ */
22
/*
33
* Interactive data-driven views using JsRender templates.
44
* Subcomponent of JsViews
@@ -17,16 +17,16 @@
1717
// global var is the this object, which is window when running in the usual browser environment
1818
var $ = global.jQuery;
1919

20-
if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
21-
define(["jquery", "./jsrender", "./jquery.observable"], function($, jsr, jso) {
22-
return factory(global, $, jsr, jso);
23-
}); // Require jQuery, JsRender, JsObservable
24-
} else if (typeof exports === "object") { // CommonJS e.g. Browserify
20+
if (typeof exports === "object") { // CommonJS e.g. Browserify
2521
module.exports = $
2622
? factory(global, $)
2723
: function($) { // If no global jQuery, take jQuery passed as parameter (with JsRender and JsObservable): require("jquery.views")(jQuery)
2824
return factory(global, $);
2925
};
26+
} else if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
27+
define(["jquery", "./jsrender", "./jquery.observable"], function($, jsr, jso) {
28+
return factory(global, $, jsr, jso);
29+
}); // Require jQuery, JsRender, JsObservable
3030
} else { // Browser using plain <script> tag
3131
factory(global, false);
3232
}
@@ -44,7 +44,7 @@ var setGlobals = $ === false; // Only set globals if script block in browser (no
4444
jsr = jsr || setGlobals && global.jsrender;
4545
$ = $ || global.jQuery;
4646

47-
var versionNumber = "v0.9.74",
47+
var versionNumber = "v0.9.75",
4848
requiresStr = "JsViews requires ";
4949

5050
if (!$ || !$.fn) {
@@ -3011,4 +3011,4 @@ $viewsSettings.advanced({
30113011
});
30123012

30133013
return $;
3014-
}, this));
3014+
}, window));

jquery.views.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.

jquery.views.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.

jsrender.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! JsRender v0.9.74 (Beta): http://jsviews.com/#jsrender */
1+
/*! JsRender v0.9.75 (Beta): http://jsviews.com/#jsrender */
22
/*! **VERSION FOR WEB** (For NODE.JS see http://jsviews.com/download/jsrender-node.js) */
33
/*
44
* Best-of-breed templating in browser or on Node.js.
@@ -15,11 +15,7 @@
1515
// global var is the this object, which is window when running in the usual browser environment
1616
var $ = global.jQuery;
1717

18-
if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
19-
define(function() {
20-
return factory(global);
21-
});
22-
} else if (typeof exports === "object") { // CommonJS e.g. Browserify
18+
if (typeof exports === "object") { // CommonJS e.g. Browserify
2319
module.exports = $
2420
? factory(global, $)
2521
: function($) { // If no global jQuery, take optional jQuery passed as parameter: require('jsrender')(jQuery)
@@ -28,6 +24,10 @@
2824
}
2925
return factory(global, $);
3026
};
27+
} else if (typeof define === "function" && define.amd) { // AMD script loader, e.g. RequireJS
28+
define(function() {
29+
return factory(global);
30+
});
3131
} else { // Browser using plain <script> tag
3232
factory(global, false);
3333
}
@@ -44,7 +44,7 @@ var setGlobals = $ === false; // Only set globals if script block in browser (no
4444

4545
$ = $ && $.fn ? $ : global.jQuery; // $ is jQuery passed in by CommonJS loader (Browserify), or global jQuery.
4646

47-
var versionNumber = "v0.9.74",
47+
var versionNumber = "v0.9.75",
4848
jsvStoreName, rTag, rTmplString, topView, $views,
4949

5050
//TODO tmplFnsCache = {},
@@ -1216,7 +1216,7 @@ function onRenderError(e, view, fallback) {
12161216
message = fallback; // There is a settings.debugMode(handler) onError override. Call it, and use return value (if any) to replace message
12171217
}
12181218

1219-
return view && !view.linkCtx && view.linked ? $converters.html(message) : message;
1219+
return view && !view.linkCtx ? $converters.html(message) : message;
12201220
}
12211221

12221222
function error(message) {
@@ -2065,4 +2065,4 @@ if (jsrToJq) { // Moving from jsrender namespace to jQuery namepace - copy over
20652065
jsr.views.sub._jq($);
20662066
}
20672067
return $ || jsr;
2068-
}, this));
2068+
}, window));

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.

0 commit comments

Comments
 (0)