Allow helperMissing to apply to simple mustaches (paves the way to support things like link_to in a Rails context)

1 files changed, 16 insertions, 5 deletions

diff --git a/lib/handlebars/runtime.js b/lib/handlebars/runtime.js
index b58ba24..e091b99 100644
--- a/lib/handlebars/runtime.js
+++ b/lib/handlebars/runtime.js
@@ -113,11 +113,22 @@ Handlebars.Runtime.prototype = {
       params[i] = this[param.type](param).data;
     }
 
-    if(toString.call(idObj.data) === "[object Function]") {
-      buf = idObj.data.apply(this.wrapContext(), params);
+    var data = idObj.data;
+
+    var type = toString.call(data);
+    var functionType = (type === "[object Function]");
+
+    if(!functionType && params.length) {
+      params = params.slice(0);
+      params.unshift(data || mustache.id.original);
+      data = this.context.helpers.helperMissing;
+      functionType = true;
+    }
+
+    if(functionType) {
+      buf = data.apply(this.wrapContext(), params);
     } else {
-      if(params.length) { throw new Error(mustache.id.parts.join("/") + " is not a Function, so you cannot have Function parameters"); }
-      buf = idObj.data;
+      buf = data;
     }
 
     if(buf && mustache.escaped) { buf = Handlebars.Utils.escapeExpression(buf); }
@@ -136,7 +147,7 @@ Handlebars.Runtime.prototype = {
 
     if(toString.call(data) !== "[object Function]") {
       params = [data];
-      data   = this.context.helpers.helperMissing;
+      data   = this.context.helpers.blockHelperMissing;
     } else {
       params = this.evaluateParams(mustache.params);
     }