Merge commit '87b5d4ee61605b026506e92c9e8873d867c5f150' into es6-modules

Conflicts: dist/handlebars.js dist/handlebars.runtime.js lib/handlebars/base.js lib/handlebars/utils.js
2013-09-02 16:19:28 -05:00
parent 530f1903aa 87b5d4ee61
commit 192887cedc
11 changed files with 96 additions and 64 deletions
@@ -348,10 +348,10 @@ JavaScriptCompiler.prototype = {
  // [lookupData]
  //
  // On stack, before: ...
-  // On stack, after: data[id], ...
+  // On stack, after: data, ...
  //
-  // Push the result of looking up `id` on the current data
-  lookupData: function(id) {
+  // Push the data lookup operator
+  lookupData: function() {
    this.push('data');
  },