Merge pull request janl#134 from brandonpayton/master

janl · janl · commit 2ead28a60eaf · 2011-11-09T07:13:35.000-08:00
Dot notation support renders 0 and boolean false values as "true"
diff --git a/examples/dot_notation.html b/examples/dot_notation.html
@@ -1,4 +1,9 @@
+<!-- exciting part -->
 <h1>{{name}}</h1>
 <p>Authors: <ul>{{#authors}}<li>{{.}}</li>{{/authors}}</ul></p>
 <p>Price: {{price.currency.symbol}}{{price.value}} {{#price.currency}}{{name}} <b>{{availability.text}}</b>{{/price.currency}}</p>
-<p>VAT: {{price.currency.symbol}}{{price.vat}}</p>
+<p>VAT: {{price.currency.symbol}}{{price.vat}}</p>
+<!-- boring part -->
+<h2>Test truthy false values:</h2>
+<p>Zero: {{truthy.zero}}</p>
+<p>False: {{truthy.notTrue}}</p>
diff --git a/examples/dot_notation.js b/examples/dot_notation.js
@@ -14,5 +14,10 @@ var dot_notation = {
   availability:{
     status: true,
     text: "In Stock"
+  },
+  // And now, some truthy false values
+  truthy: {
+    zero: 0,
+    notTrue: false
   }
 };
diff --git a/examples/dot_notation.txt b/examples/dot_notation.txt
@@ -1,4 +1,9 @@
+<!-- exciting part -->
 <h1>A Book</h1>
 <p>Authors: <ul><li>John Power</li><li>Jamie Walsh</li></ul></p>
 <p>Price: &euro;200 Euro <b>In Stock</b></p>
 <p>VAT: &euro;40</p>
+<!-- boring part -->
+<h2>Test truthy false values:</h2>
+<p>Zero: 0</p>
+<p>False: false</p>
diff --git a/mustache.js b/mustache.js
@@ -272,7 +272,10 @@ var Mustache = function() {
       
       // check for dot notation eg. foo.bar
       if(name.match(/([a-z_]+)\./ig)){
-        value = is_kinda_truthy(this.walk_context(name, context));
+        var childValue = this.walk_context(name, context);
+        if(is_kinda_truthy(childValue)) {
+          value = childValue;
+        }
       }
       else{
         if(is_kinda_truthy(context[name])) {
