Merge branch 'compiler-options' of github.com:blakeembrey/handlebars.js into blakeembrey-compiler-options

Conflicts: lib/handlebars/compiler/javascript-compiler.js
2014-01-01 19:38:31 -06:00
parent 6e4e1f8404 150e55aa00
commit e0d0ad5027
1 changed files with 9 additions and 4 deletions
@@ -837,9 +837,7 @@ JavaScriptCompiler.prototype = {
    };
  },

-  // the params and contexts arguments are passed in arrays
-  // to fill in
-  setupParams: function(paramSize, params, useRegister) {
+  setupOptions: function(paramSize, params) {
    var options = [], contexts = [], types = [], param, inverse, program;

    options.push("hash:" + this.popStack());
@@ -888,7 +886,14 @@ JavaScriptCompiler.prototype = {
      options.push("data:data");
    }

-    options = "{" + options.join(",") + "}";
+    return options;
+  },
+
+  // the params and contexts arguments are passed in arrays
+  // to fill in
+  setupParams: function(paramSize, params, useRegister) {
+    var options = '{' + this.setupOptions(paramSize, params).join(',') + '}';
+
    if (useRegister) {
      this.useRegister('options');
      params.push('options');