Merge edbfaaf1ba into 1a244cbbd9

mustache.js

@@ -595,7 +595,9 @@
   Writer.prototype.renderPartial = function renderPartial (token, context, partials, tags) {
     if (!partials) return;
 
-    var value = isFunction(partials) ? partials(token[1]) : partials[token[1]];
+    var value = isFunction(partials)
+      ? partials(token[1], context.view)
+      : partials[token[1]];
     if (value != null)
       return this.renderTokens(this.parse(value, tags), context, partials, value);
   };

test/_files/partial_function.js

@@ -0,0 +1,4 @@
+({
+  id: 'main',
+  value: 'foo'
+})

test/_files/partial_function.mustache

@@ -0,0 +1 @@
+{{>partial}}

test/_files/partial_function.partial

@@ -0,0 +1 @@
+{{id}}: {{value}}

test/_files/partial_function.txt

@@ -0,0 +1 @@
+main: foo

test/render-test.js

@@ -65,7 +65,13 @@ describe('Mustache.render', function () {
     it('knows how to render ' + test.name, function () {
       var output;
       if (test.partial) {
-        output = Mustache.render(test.template, view, { partial: test.partial });
+        // Ensure partials can be retreived via an object or a function
+        // See Writer.prototype.renderPartial
+        var partial = test.name === 'partial_function'
+          ? function (partial, context) { return test.partial }
+          : { partial: test.partial };
+
+        output = Mustache.render(test.template, view, partial);
       } else {
         output = Mustache.render(test.template, view);
       }