Strings matched by the encoding regular expression, but not found in the encoding map are now removed from the output.

blueimp · blueimp · commit b6d6bda1e227 · 2012-02-16T17:23:49.000+09:00
Added single quotes to the default characters to encode: ' => &blueimp#39; This allows safely using single quotes for attributes in HTML documents, e.g. for embedding JSON, which requires double quotes for its own properties and string values.
diff --git a/README.md b/README.md
@@ -155,20 +155,18 @@ result = tmpl("tmpl-demo", data); // Loads and parses the template again
 ```
 
 ### Output encoding
-The method **tmpl.encode** is used to escape HTML special characters in template output:
+The method **tmpl.encode** is used to escape HTML special characters in the template output:
 
 ```js
-var output = tmpl.encode("<>&\"\x00"); // Renders "&lt;&gt;&amp;&quot;"
+var output = tmpl.encode("<>&\"'\x00"); // Renders "&lt;&gt;&amp;&quot;&#39;"
 ```
 
-**tmpl.encode** makes use of the regular expression **tmpl.encReg** and the encoding map **tmpl.encMap** to match and replace special characters, which can be modified to change the behavior of the output encoding:
+**tmpl.encode** makes use of the regular expression **tmpl.encReg** and the encoding map **tmpl.encMap** to match and replace special characters, which can be modified to change the behavior of the output encoding.  
+Strings matched by the regular expression, but not found in the encoding map are removed from the output. This allows for example to automatically trim input values (removing whitespace from the start and end of the string):
 
 ```js
-// Add single quotes to the encoding rules:
-tmpl.encReg = /[<>&"'\x00]/g;
-tmpl.encMap["'"] = "&#39;";
-
-var output = tmpl.encode("<>&\"'\x00"); // Renders "&lt;&gt;&amp;&quot;&#39;"
+tmpl.encReg = /(^\s+)|(\s+$)|[<>&"'\x00]/g;
+var output = tmpl.encode("    Banana!    "); // Renders "Banana" (without whitespace)
 ```
 
 ### Local helper variables
diff --git a/compile.js b/compile.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
- * JavaScript Templates Compiler 2.0
+ * JavaScript Templates Compiler 2.1.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * JavaScript Templates Demo 2.0
+ * JavaScript Templates Demo 2.1.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "blueimp-tmpl",
-    "version": "2.0.0",
+    "version": "2.1.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/runtime.js b/runtime.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Templates Runtime 2.0
+ * JavaScript Templates Runtime 2.1.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -20,19 +20,19 @@
         };
     };
     tmpl.cache = {};
-    tmpl.encReg = /[<>&"\x00]/g;
+    tmpl.encReg = /[<>&"'\x00]/g;
     tmpl.encMap = {
-        "<": "&lt;",
-        ">": "&gt;",
-        "&": "&amp;",
-        "\"": "&quot;",
-        "\x00": ""
+        "<"   : "&lt;",
+        ">"   : "&gt;",
+        "&"   : "&amp;",
+        "\""  : "&quot;",
+        "'"   : "&#39;"
     };
     tmpl.encode = function (s) {
         return String(s || "").replace(
             tmpl.encReg,
             function (c) {
-                return tmpl.encMap[c];
+                return tmpl.encMap[c] || "";
             }
         );
     };
diff --git a/test/index.html b/test/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * JavaScript Templates Test 2.0
+ * JavaScript Templates Test 2.1.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
diff --git a/test/test.js b/test/test.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Templates Test 2.0
+ * JavaScript Templates Test 2.1.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -31,7 +31,7 @@
             nullValue: null,
             falseValue: false,
             zeroValue: 0,
-            special:  '<>&"\x00',
+            special:  '<>&"\'\x00',
             list: [1, 2, 3, 4, 5],
             func: function () {
                 return this.value;
@@ -84,14 +84,14 @@
         it('Escape HTML special characters with {%=o.prop%}', function () {
             expect(
                 tmpl('{%=o.special%}', data),
-                '&lt;&gt;&amp;&quot;'
+                '&lt;&gt;&amp;&quot;&#39;'
             );
         });
 
         it('Allow HTML special characters with {%#o.prop%}', function () {
             expect(
                 tmpl('{%#o.special%}', data),
-                '<>&"\x00'
+                '<>&"\'\x00'
             );
         });
 
@@ -176,14 +176,14 @@
         it('Escape HTML special characters with print(data)', function () {
             expect(
                 tmpl('{% print(o.special); %}', data),
-                '&lt;&gt;&amp;&quot;'
+                '&lt;&gt;&amp;&quot;&#39;'
             );
         });
 
         it('Allow HTML special characters with print(data, true)', function () {
             expect(
                 tmpl('{% print(o.special, true); %}', data),
-                '<>&"\x00'
+                '<>&"\'\x00'
             );
         });
 
diff --git a/tmpl.js b/tmpl.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Templates 2.0
+ * JavaScript Templates 2.1.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -57,19 +57,19 @@
             return "_s+='";
         }
     };
-    tmpl.encReg = /[<>&"\x00]/g;
+    tmpl.encReg = /[<>&"'\x00]/g;
     tmpl.encMap = {
         "<"   : "&lt;",
         ">"   : "&gt;",
         "&"   : "&amp;",
         "\""  : "&quot;",
-        "\x00": ""
+        "'"   : "&#39;"
     };
     tmpl.encode = function (s) {
         return String(s || "").replace(
             tmpl.encReg,
             function (c) {
-                return tmpl.encMap[c];
+                return tmpl.encMap[c] || "";
             }
         );
     };
diff --git a/tmpl.min.js b/tmpl.min.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/usr/bin/env node`
`2`	`2`	`/*`
`3`		`- * JavaScript Templates Compiler 2.0`
	`3`	`+ * JavaScript Templates Compiler 2.1.0`
`4`	`4`	`* https://github.com/blueimp/JavaScript-Templates`
`5`	`5`	`*`
`6`	`6`	`* Copyright 2011, Sebastian Tschan`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<!DOCTYPE HTML>`
`2`	`2`	`<!--`
`3`	`3`	`/*`
`4`		`- * JavaScript Templates Demo 2.0`
	`4`	`+ * JavaScript Templates Demo 2.1.0`
`5`	`5`	`* https://github.com/blueimp/JavaScript-Templates`
`6`	`6`	`*`
`7`	`7`	`* Copyright 2011, Sebastian Tschan`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "blueimp-tmpl",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "2.1.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": [`