Merge remote-tracking branch 'upstream/master'

janl · Dec 6, 2012 · 8296983 · 8296983
2 parents e0edb35 + 79b08c3
commit 8296983
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/mustache.js b/mustache.js
@@ -254,7 +254,8 @@ var Mustache;
         return self.render(template, context);
       };
 
-      return value.call(context.view, text, scopedRender) || "";
+      var result = value.call(context.view, text, scopedRender);
+      return result != null ? result : "";
     default:
       if (value) {
         return callback(this, context);

diff --git a/test/_files/check_falsy.js b/test/_files/check_falsy.js
@@ -0,0 +1,7 @@
+({
+  number: function(text, render) {
+    return function(text, render) {
+      return +render(text);
+    }
+  }
+})
diff --git a/test/_files/check_falsy.mustache b/test/_files/check_falsy.mustache
@@ -0,0 +1 @@
+<p>{{#number}}0{{/number}}</p>
diff --git a/test/_files/check_falsy.txt b/test/_files/check_falsy.txt
@@ -0,0 +1 @@
+<p>0</p>