Allow the modulo operator in evaluation context. Closes blueimp#30

blueimp · blueimp · commit 8d3c890f90c6 · 2013-07-29T17:13:57.000-05:00
diff --git a/README.md b/README.md
@@ -228,7 +228,7 @@ The template contents are matched and replaced using the regular expression **tm
 To use different tags for the template syntax, override **tmpl.regexp** with a modified regular expression, by exchanging all occurrences of "{%" and "%}", e.g. with "[%" and "%]":
 
 ```js
-tmpl.regexp = /([\s'\\])(?![^%]*%\])|(?:\[%(=|#)([\s\S]+?)%\])|(\[%)|(%\])/g;
+tmpl.regexp = /([\s'\\])(?!(?:[^[]|\[(?!%))*%\])|(?:\[%(=|#)([\s\S]+?)%\])|(\[%)|(%\])/g;
 ```
 
 By default, the plugin preserves whitespace (newlines, carriage returns, tabs and spaces). To strip unnecessary whitespace, you can override the **tmpl.func** function, e.g. with the following code:
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "blueimp-tmpl",
-    "version": "2.2.2",
+    "version": "2.3.0",
     "title": "JavaScript Templates",
     "description": "< 1KB lightweight, fast & powerful JavaScript templating engine with zero dependencies. Compatible with server-side environments like node.js, module loaders like RequireJS and all web browsers.",
     "keywords": [
diff --git a/js/tmpl.js b/js/tmpl.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Templates 2.2.0
+ * JavaScript Templates 2.3.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -12,7 +12,7 @@
  * http://ejohn.org/blog/javascript-micro-templating/
  */
 
-/*jslint evil: true, regexp: true */
+/*jslint evil: true, regexp: true, unparam: true */
 /*global document, define */
 
 (function ($) {
@@ -34,15 +34,15 @@
     tmpl.load = function (id) {
         return document.getElementById(id).innerHTML;
     };
-    tmpl.regexp = /([\s'\\])(?![^%]*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g;
+    tmpl.regexp = /([\s'\\])(?!(?:[^{]|\{(?!%))*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g;
     tmpl.func = function (s, p1, p2, p3, p4, p5) {
-        if (p1) { // whitespace, quote and backspace in interpolation context
+        if (p1) { // whitespace, quote and backspace in HTML context
             return {
                 "\n": "\\n",
                 "\r": "\\r",
                 "\t": "\\t",
                 " " : " "
-            }[s] || "\\" + s;
+            }[p1] || "\\" + p1;
         }
         if (p2) { // interpolation: {%=prop%}, or unescaped: {%#prop%}
             if (p2 === "=") {
diff --git a/js/tmpl.min.js b/js/tmpl.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "blueimp-tmpl",
-    "version": "2.2.2",
+    "version": "2.3.0",
     "title": "JavaScript Templates",
     "description": "< 1KB lightweight, fast & powerful JavaScript templating engine with zero dependencies. Compatible with server-side environments like node.js, module loaders like RequireJS and all web browsers.",
     "keywords": [
diff --git a/test/test.js b/test/test.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Templates Test 2.2.0
+ * JavaScript Templates Test 2.3.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -250,6 +250,17 @@
             );
         });
 
+        it('Modulo operator', function () {
+            expect(
+                tmpl(
+                    '{% if (o.list.length % 5 === 0) { %}5 list items{% } %}',
+                    data
+                ).replace(/[\r\n]/g, '')
+            ).to.be(
+                '5 list items'
+            );
+        });
+
     });
 
 }(

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "blueimp-tmpl",`
`3`		`- "version": "2.2.2",`
	`3`	`+ "version": "2.3.0",`
`4`	`4`	`"title": "JavaScript Templates",`
`5`	`5`	`"description": "< 1KB lightweight, fast & powerful JavaScript templating engine with zero dependencies. Compatible with server-side environments like node.js, module loaders like RequireJS and all web browsers.",`
`6`	`6`	`"keywords": [`