Merge with upstream/master

2012-08-21 12:49:40 -05:00
parent fc99d90337 6761d4c6d1
commit dc0426d836
5 changed files with 61 additions and 3 deletions
@@ -240,7 +240,13 @@ Handlebars.JavaScriptCompiler = function() {};
    ID: function(id) {
      this.addDepth(id.depth);
      this.opcode('getContext', id.depth);
-      this.opcode('lookupOnContext', id.parts[0]);
+
+      var name = id.parts[0];
+      if (!name) {
+        this.opcode('pushContext');
+      } else {
+        this.opcode('lookupOnContext', id.parts[0]);
+      }

      for(var i=1, l=id.parts.length; i<l; i++) {
        this.opcode('lookup', id.parts[i]);