diff --git a/examples/dot_notation.js b/examples/dot_notation.js index a28f8db..0628b7d 100644 --- a/examples/dot_notation.js +++ b/examples/dot_notation.js @@ -1,23 +1,23 @@ var dot_notation = { - name: "A Book", - authors: ["John Power", "Jamie Walsh"], - price:{ - value: 200, - vat: function() { - return this.value * 0.2; - }, - currency: { - symbol: '€', - name: 'Euro' - } - }, - availability:{ - status: true, - text: "In Stock" - }, - // And now, some truthy false values - truthy: { - zero: 0, - notTrue: false - } + name: "A Book", + authors: ["John Power", "Jamie Walsh"], + price:{ + value: 200, + vat: function() { + return this.value * 0.2; + }, + currency: { + symbol: '€', + name: 'Euro' + } + }, + availability:{ + status: true, + text: "In Stock" + } + // And now, some truthy false values + truthy: { + zero: 0, + notTrue: false + } }; diff --git a/mustache.js b/mustache.js index 4310d70..5677871 100644 --- a/mustache.js +++ b/mustache.js @@ -269,21 +269,21 @@ var Mustache = function() { } var value; - - // check for dot notation eg. foo.bar - if(name.match(/([a-z_]+)\./ig)){ + + // check for dot notation eg. foo.bar + if(name.match(/([a-z_]+)\./ig)){ var childValue = this.walk_context(name, context); if(is_kinda_truthy(childValue)) { value = childValue; } - } - else{ - if(is_kinda_truthy(context[name])) { - value = context[name]; - } else if(is_kinda_truthy(this.context[name])) { - value = this.context[name]; - } - } + } + else{ + if(is_kinda_truthy(context[name])) { + value = context[name]; + } else if(is_kinda_truthy(this.context[name])) { + value = this.context[name]; + } + } if(typeof value === "function") { return value.apply(context); @@ -295,21 +295,21 @@ var Mustache = function() { return ""; }, - walk_context: function(name, context){ - var path = name.split('.'); - // if the var doesn't exist in current context, check the top level context - var value_context = (context[path[0]] != undefined) ? context : this.context; - var value = value_context[path.shift()]; - while(value != undefined && path.length > 0){ - value_context = value; - value = value[path.shift()]; - } - // if the value is a function, call it, binding the correct context - if(typeof value === "function") { + walk_context: function(name, context){ + var path = name.split('.'); + // if the var doesn't exist in current context, check the top level context + var value_context = (context[path[0]] != undefined) ? context : this.context; + var value = value_context[path.shift()]; + while(value != undefined && path.length > 0){ + value_context = value; + value = value[path.shift()]; + } + // if the value is a function, call it, binding the correct context + if(typeof value === "function") { return value.apply(value_context); } - return value; - }, + return value; + }, // Utility methods