Make deep @data trigger the data option

This commit is contained in:
Yehuda Katz
2012-07-05 23:05:55 -07:00
parent 5e8be14d78
commit 46c04fa71e
2 changed files with 29 additions and 7 deletions
+4 -2
View File
@@ -216,7 +216,7 @@ Handlebars.JavaScriptCompiler = function() {};
}
if (id.type === 'DATA') {
this.opcode('lookupData', id.id);
this.DATA(id);
} else if (id.parts.length) {
this.opcode('lookupOnContext', id.parts[0]);
for(var i=1, l=id.parts.length; i<l; i++) {
@@ -252,6 +252,7 @@ Handlebars.JavaScriptCompiler = function() {};
},
DATA: function(data) {
this.options.data = true;
this.opcode('lookupData', data.id);
},
@@ -446,7 +447,8 @@ Handlebars.JavaScriptCompiler = function() {};
if (!this.isChild) {
var namespace = this.namespace;
var copies = "helpers = helpers || " + namespace + ".helpers;";
if(this.environment.usePartial) { copies = copies + " partials = partials || " + namespace + ".partials;"; }
if (this.environment.usePartial) { copies = copies + " partials = partials || " + namespace + ".partials;"; }
if (this.options.data) { copies = copies + " data = data || {};"; }
out.push(copies);
} else {
out.push('');