diff options
| author | kpdecker <kpdecker@gmail.com> | 2014-07-07 00:20:02 -0500 |
|---|---|---|
| committer | kpdecker <kpdecker@gmail.com> | 2014-07-07 00:20:02 -0500 |
| commit | c90cfe247cf1108f94fd97b4e93a42f4a49d3516 (patch) | |
| tree | 0e2dd5e3596a8c3165d58459b88b71d92c275c98 /lib/handlebars/compiler/javascript-compiler.js | |
| parent | 107aa4a66ada6fd18e9a890c434f382bae2da998 (diff) | |
| download | handlebars.js-c90cfe247cf1108f94fd97b4e93a42f4a49d3516.zip handlebars.js-c90cfe247cf1108f94fd97b4e93a42f4a49d3516.tar.gz handlebars.js-c90cfe247cf1108f94fd97b4e93a42f4a49d3516.tar.bz2 | |
Use ID lookup for ambiguous helper evaluation
Final change for #731
Diffstat (limited to 'lib/handlebars/compiler/javascript-compiler.js')
| -rw-r--r-- | lib/handlebars/compiler/javascript-compiler.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/compiler/javascript-compiler.js index 09309b5..b2baad4 100644 --- a/lib/handlebars/compiler/javascript-compiler.js +++ b/lib/handlebars/compiler/javascript-compiler.js @@ -577,11 +577,12 @@ JavaScriptCompiler.prototype = { this.aliases.functionType = '"function"'; this.useRegister('helper'); + var nonHelper = this.popStack(); + this.emptyHash(); var helper = this.setupHelper(0, name, helperCall); var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper'); - var nonHelper = '(depth' + this.lastContext + ' && ' + this.nameLookup('depth' + this.lastContext, name, 'context') + ')'; this.push( '((helper = ' + helperName + ' || ' + nonHelper |