From 30034c75e78c13d1311de65669760d13024a0993 Mon Sep 17 00:00:00 2001
From: kpdecker <kpdecker@gmail.com>
Date: Thu, 6 Nov 2014 09:43:43 -0600
Subject: [PATCH] Merge setupParams and setupOptions

---
 lib/handlebars/compiler/javascript-compiler.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/compiler/javascript-compiler.js
index 661d1e21..2c23632c 100644
--- a/lib/handlebars/compiler/javascript-compiler.js
+++ b/lib/handlebars/compiler/javascript-compiler.js
@@ -848,7 +848,7 @@ JavaScriptCompiler.prototype = {
     };
   },
 
-  setupOptions: function(helper, paramSize, params) {
+  setupParams: function(helper, paramSize, params, useRegister) {
     var options = {}, contexts = [], types = [], ids = [], param, inverse, program;
 
     options.name = this.quotedString(helper);
@@ -908,14 +908,7 @@ JavaScriptCompiler.prototype = {
       options.data = "data";
     }
 
-    return options;
-  },
-
-  // the params and contexts arguments are passed in arrays
-  // to fill in
-  setupParams: function(helperName, paramSize, params, useRegister) {
-    var options = this.objectLiteral(this.setupOptions(helperName, paramSize, params));
-
+    options = this.objectLiteral(options);
     if (useRegister) {
       this.useRegister('options');
       params.push('options');