Print out falsy values. Closes blueimp#26.

blueimp · blueimp · commit 6ad43cf40b1f · 2013-06-17T14:46:31.000-05:00
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
 .PHONY: js
 
 js:
-	uglifyjs -nc tmpl.js > tmpl.min.js
+	node_modules/.bin/uglifyjs tmpl.js -c -m -o tmpl.min.js
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # JavaScript Templates
 
 ## Demo
-[JavaScript Templates Demo](http://blueimp.github.com/JavaScript-Templates/)
+[JavaScript Templates Demo](http://blueimp.github.io/JavaScript-Templates/)
 
 ## Usage
 
@@ -271,14 +271,6 @@ Use dot notation to print nested properties:
 <strong>{%=o.author.name%}</strong>
 ```
 
-Note that the JavaScript Templates engine prints **falsy** values as empty strings.  
-That is, **undefined**, **null**, **false**, **0** and **NaN** will all be converted to **''**.  
-To be able to print e.g. the number 0, convert it to a String before using it as an output variable:
-
-```html
-<h3>{%=0+''%}</h3>
-```
-
 ### Evaluation
 Use **print(str)** to add escaped content to the output:
 
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * JavaScript Templates Demo 2.1.0
+ * JavaScript Templates Demo 2.2.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -13,16 +13,19 @@
 -->
 <html lang="en">
 <head>
-<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><![endif]-->
+<!--[if IE]>
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<![endif]-->
 <meta charset="utf-8">
 <title>JavaScript Templates Demo</title>
 <meta name="description" content="&lt; 1KB lightweight, fast &amp; powerful JavaScript templating engine with zero dependencies. Compatible with server-side environments like node.js, module loaders like RequireJS and all web browsers.">
-<meta name="viewport" content="width=device-width">
-<link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap.min.css">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="stylesheet" href="http://blueimp.github.io/cdn/css/bootstrap.min.css">
 <style>body{padding-top:60px;}</style>
-<link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap-responsive.min.css">
-<!--[if lt IE 7]><link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap-ie6.min.css"><![endif]-->
-<!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+<link rel="stylesheet" href="http://blueimp.github.io/cdn/css/bootstrap-responsive.min.css">
+<!--[if lt IE 7]>
+<link rel="stylesheet" href="http://blueimp.github.io/cdn/css/bootstrap-ie6.min.css">
+<![endif]-->
 </head>
 <body>
 <div class="navbar navbar-fixed-top">
@@ -36,8 +39,8 @@
             <a class="brand" href="https://github.com/blueimp/JavaScript-Templates">JavaScript Templates</a>
             <div class="nav-collapse">
                 <ul class="nav">
-                    <li class="active"><a href="#">Demo</a></li>
-                    <li><a href="https://github.com/blueimp/JavaScript-Templates/downloads">Downloads</a></li>
+                    <li class="active"><a href="http://blueimp.github.io/JavaScript-Templates/">Demo</a></li>
+                    <li><a href="https://github.com/blueimp/JavaScript-Templates/tags">Downloads</a></li>
                     <li><a href="https://github.com/blueimp/JavaScript-Templates">Source Code</a></li>
                     <li><a href="https://github.com/blueimp/JavaScript-Templates">Documentation</a></li>
                     <li><a href="https://github.com/blueimp/JavaScript-Templates/issues">Issues</a></li>
@@ -108,7 +111,7 @@ <h4>Features</h4>
 <script src="tmpl.min.js"></script>
 <!-- jQuery and Bootstrap JS are not required, but included for the demo -->
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-<script src="http://blueimp.github.com/cdn/js/bootstrap.min.js"></script>
+<script src="http://blueimp.github.io/cdn/js/bootstrap.min.js"></script>
 <script>
 /*global window, jQuery, tmpl */
 (function ($) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "blueimp-tmpl",
-    "version": "2.1.0",
+    "version": "2.2.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": [
@@ -31,9 +31,9 @@
         }
     ],
     "devDependencies": {
-        "mocha": "latest",
-        "expect.js": "latest",
-        "uglify-js": "latest"
+        "mocha": "1.11.0",
+        "expect.js": "0.2.0",
+        "uglify-js": "2.3.6"
     },
     "scripts": {
         "test": "mocha --reporter spec"
diff --git a/runtime.js b/runtime.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Templates Runtime 2.1.0
+ * JavaScript Templates Runtime 2.2.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -29,7 +29,7 @@
         "'"   : "&#39;"
     };
     tmpl.encode = function (s) {
-        return String(s || "").replace(
+        return String(s).replace(
             tmpl.encReg,
             function (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.1.0
+ * JavaScript Templates Test 2.2.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -17,13 +17,13 @@
 <meta charset="utf-8">
 <title>JavaScript Templates Test</title>
 <meta name="viewport" content="width=device-width">
-<link rel="stylesheet" href="http://blueimp.github.com/cdn/css/mocha.min.css">
+<link rel="stylesheet" href="http://blueimp.github.io/cdn/css/mocha.min.css">
 </head>
 <body>
 <div id="mocha"></div>
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-<script src="http://blueimp.github.com/cdn/js/mocha.min.js"></script>
-<script src="http://blueimp.github.com/cdn/js/expect.min.js"></script>
+<script src="http://blueimp.github.io/cdn/js/mocha.min.js"></script>
+<script src="http://blueimp.github.io/cdn/js/expect.min.js"></script>
 <script>
 mocha.setup('bdd');
 $(function () {
diff --git a/test/template.html b/test/template.html
diff --git a/test/test.js b/test/test.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Templates Test 2.1.0
+ * JavaScript Templates Test 2.2.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -11,14 +11,16 @@
 
 /*global beforeEach, afterEach, describe, it, expect, require */
 
-(function (expect, tmpl) {
+(function (context, expect, tmpl) {
     'use strict';
 
-    if (typeof require !== 'undefined') {
+    if (context.require === undefined) {
         // Override the template loading method:
         tmpl.load = function (id) {
-            return require('fs')
-                .readFileSync('./test/' + id + '.html', 'utf8');
+            switch (id) {
+            case 'template':
+                return '{%=o.value%}';
+            }
         };
     }
 
@@ -130,7 +132,7 @@
             );
         });
 
-        it('Print empty string for escaped falsy values', function () {
+        it('Print out escaped falsy values', function () {
             expect(
                 tmpl(
                     '{%=o.undefinedValue%}{% print(o.undefinedValue); %}' +
@@ -140,11 +142,11 @@
                     data
                 )
             ).to.be(
-                ''
+                'undefinedundefinednullnullfalsefalse00'
             );
         });
 
-        it('Print empty string for unescaped falsy values', function () {
+        it('Print out unescaped falsy values', function () {
             expect(
                 tmpl(
                     '{%#o.undefinedValue%}{% print(o.undefinedValue, true); %}' +
@@ -154,7 +156,7 @@
                     data
                 )
             ).to.be(
-                ''
+                'undefinedundefinednullnullfalsefalse00'
             );
         });
 
@@ -251,6 +253,7 @@
     });
 
 }(
+    this,
     this.expect || require('expect.js'),
     this.tmpl || require('../tmpl').tmpl
 ));
diff --git a/tmpl.js b/tmpl.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Templates 2.1.0
+ * JavaScript Templates 2.2.0
  * https://github.com/blueimp/JavaScript-Templates
  *
  * Copyright 2011, Sebastian Tschan
@@ -48,7 +48,7 @@
             if (p2 === "=") {
                 return "'+_e(" + p3 + ")+'";
             }
-            return "'+(" + p3 + "||'')+'";
+            return "'+" + p3 + "+'";
         }
         if (p4) { // evaluation start tag: {%
             return "';";
@@ -66,7 +66,7 @@
         "'"   : "&#39;"
     };
     tmpl.encode = function (s) {
-        return String(s || "").replace(
+        return String(s).replace(
             tmpl.encReg,
             function (c) {
                 return tmpl.encMap[c] || "";
diff --git a/tmpl.min.js b/tmpl.min.js
