Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#679]: Fix partials were not rendering tokens when not using default… #679

Closed
wants to merge 1 commit into from
Closed

[#679]: Fix partials were not rendering tokens when not using default… #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,6 +3,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [3.0.1] / 28 September 2018

* [#678]: Fix partials were not rendering tokens when not using default tags, by [@stackchain].


## [3.0.0] / 16 September 2018

We are very happy to announce a new major version of mustache.js. We want to be very careful not to break projects
Expand Down
10 changes: 5 additions & 5 deletions mustache.js
View file
Open in desktop
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