Use ID lookup for ambiguous helper evaluation

Final change for #731
handlebars-lang · Jul 7, 2014 · c90cfe2 · c90cfe2
1 parent 107aa4a
commit c90cfe2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/handlebars/compiler/compiler.js b/lib/handlebars/compiler/compiler.js
@@ -245,6 +245,8 @@ Compiler.prototype = {
     this.opcode('pushProgram', program);
     this.opcode('pushProgram', inverse);
 
+    this.ID(id);
+
     this.opcode('invokeAmbiguous', name, isBlock);
   },
 

diff --git 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