Use {%#o.prop%} instead of {%!o.prop%} to print unescaped strings, to avoid confusion with negated variables.

Remove empty string concatenations from the generated template function body.

Author: blueimp

README.md

@@ -226,7 +226,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+)|('|\\)(?![^%]*%\])|(?:\[%(=|!)(.+?)%\])|(\[%)|(%\])/g;
+tmpl.regexp = /(\s+)|('|\\)(?![^%]*%\])|(?:\[%(=|#)(.+?)%\])|(\[%)|(%\])/g;
 ```
 
 ## Templates syntax
@@ -241,7 +241,7 @@ Print variable with HTML special characters escaped:
 Print variable without escaping:
 
 ```html
-<h3>{%!o.user_id%}</h3>
+<h3>{%#o.user_id%}</h3>
 ```
 
 Print output of function calls:

package.json

@@ -15,5 +15,5 @@
         "test": "node ./test/test.js"
     },
     "main": "tmpl",
-    "version": "1.0.0"
+    "version": "1.0.1"
 }

test/test.js

@@ -1,5 +1,5 @@
 /*
- * JavaScript Templates Test 1.0
+ * JavaScript Templates Test 1.0.1
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -92,9 +92,9 @@
         );
     });
 
-    $.test('Allow HTML special characters with {%!o.prop%}', function () {
+    $.test('Allow HTML special characters with {%#o.prop%}', function () {
         $.strictEqual(
-            $.tmpl('{%!o.special%}', data),
+            $.tmpl('{%#o.special%}', data),
             '<>&"\x00'
         );
     });

tmpl.js

@@ -1,5 +1,5 @@
 /*
- * JavaScript Templates 1.0
+ * JavaScript Templates 1.0.1
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -22,9 +22,9 @@
                 tmpl(tmpl.load(str)) :
                     new Function(
                         tmpl.arg,
-                        "var _s=''" + tmpl.helper + ";_s+='" +
+                        ("var _s=''" + tmpl.helper + ";_s+='" +
                             str.replace(tmpl.regexp, tmpl.func) +
-                            "';return _s;"
+                            "';return _s;").split("_s+='';").join("")
                     );
         f.tmpl = f.tmpl || tmpl;
         return data ? f(data) : f;
@@ -33,15 +33,15 @@
     tmpl.load = function (id) {
         return document.getElementById(id).innerHTML;
     };
-    tmpl.regexp = /(\s+)|('|\\)(?![^%]*%\})|(?:\{%(=|!)(.+?)%\})|(\{%)|(%\})/g;
+    tmpl.regexp = /(\s+)|('|\\)(?![^%]*%\})|(?:\{%(=|#)(.+?)%\})|(\{%)|(%\})/g;
     tmpl.func = function (s, p1, p2, p3, p4, p5, p6, o, str) {
         if (p1) { // whitespace
             return o && o + s.length !== str.length ? " " : "";
         }
         if (p2) { // single quote or backslash
             return "\\" + s;
         }
-        if (p3) { // interpolation: {%=prop%}, or unescaped: {%!prop%}
+        if (p3) { // interpolation: {%=prop%}, or unescaped: {%#prop%}
             if (p3 === "=") {
                 return "'+_e(" + p4 + ")+'";
             }