Skip to content

Commit

Permalink
Fix partials not rendering tokens when using custom tags (#618)
Browse files Browse the repository at this point in the history
  • Loading branch information
stackchain authored and phillipj committed Nov 11, 2018
1 parent 17510f0 commit 864b5a5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions mustache.js
Expand Up @@ -514,7 +514,7 @@
Writer.prototype.render = function render (template, view, partials, tags) {
var tokens = this.parse(template, tags);
var context = (view instanceof Context) ? view : new Context(view);
return this.renderTokens(tokens, context, partials, template);
return this.renderTokens(tokens, context, partials, template, tags);
};

/**
Expand All @@ -526,7 +526,7 @@
* If the template doesn't use higher-order sections, this argument may
* be omitted.
*/
Writer.prototype.renderTokens = function renderTokens (tokens, context, partials, originalTemplate) {
Writer.prototype.renderTokens = function renderTokens (tokens, context, partials, originalTemplate, tags) {
var buffer = '';

var token, symbol, value;
Expand All @@ -537,7 +537,7 @@

if (symbol === '#') value = this.renderSection(token, context, partials, originalTemplate);
else if (symbol === '^') value = this.renderInverted(token, context, partials, originalTemplate);
else if (symbol === '>') value = this.renderPartial(token, context, partials, originalTemplate);
else if (symbol === '>') value = this.renderPartial(token, context, partials, tags);
else if (symbol === '&') value = this.unescapedValue(token, context);
else if (symbol === 'name') value = this.escapedValue(token, context);
else if (symbol === 'text') value = this.rawValue(token);
Expand Down Expand Up @@ -592,12 +592,12 @@
return this.renderTokens(token[4], context, partials, originalTemplate);
};

Writer.prototype.renderPartial = function renderPartial (token, context, partials) {
Writer.prototype.renderPartial = function renderPartial (token, context, partials, tags) {
if (!partials) return;

var value = isFunction(partials) ? partials(token[1]) : partials[token[1]];
if (value != null)
return this.renderTokens(this.parse(value), context, partials, value);
return this.renderTokens(this.parse(value, tags), context, partials, value);
};

Writer.prototype.unescapedValue = function unescapedValue (token, context) {
Expand Down

0 comments on commit 864b5a5

Please sign in to comment.