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

Conflicts:
	lib/handlebars/compiler/javascript-compiler.js

1 files changed, 9 insertions, 4 deletions

diff --git a/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/compiler/javascript-compiler.js
index cd75af9..7539068 100644
--- a/lib/handlebars/compiler/javascript-compiler.js
+++ b/lib/handlebars/compiler/javascript-compiler.js
@@ -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');