summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpdecker <kpdecker@gmail.com>2015-09-02 20:43:54 -0500
committerkpdecker <kpdecker@gmail.com>2015-09-02 20:43:54 -0500
commit05b82a203e729b5caa206aabfef5456d84e10746 (patch)
treea5c82dd082a5f274f457901918c6f4205f5bfdda
parentf71f4e759e7812979aa7ec058c4802c9a8c7235b (diff)
downloadhandlebars.js-05b82a203e729b5caa206aabfef5456d84e10746.zip
handlebars.js-05b82a203e729b5caa206aabfef5456d84e10746.tar.gz
handlebars.js-05b82a203e729b5caa206aabfef5456d84e10746.tar.bz2
Fix failure when using decorators in partials
-rw-r--r--lib/handlebars/compiler/javascript-compiler.js1
-rw-r--r--spec/regressions.js9
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/compiler/javascript-compiler.js
index ff583c7..d0f206c 100644
--- a/lib/handlebars/compiler/javascript-compiler.js
+++ b/lib/handlebars/compiler/javascript-compiler.js
@@ -703,6 +703,7 @@ JavaScriptCompiler.prototype = {
}
options.helpers = 'helpers';
options.partials = 'partials';
+ options.decorators = 'container.decorators';
if (!isDynamic) {
params.unshift(this.nameLookup('partials', name, 'partial'));
diff --git a/spec/regressions.js b/spec/regressions.js
index 825ee35..ae0797e 100644
--- a/spec/regressions.js
+++ b/spec/regressions.js
@@ -203,4 +203,13 @@ describe('Regressions', function() {
array[3] = 'bar';
shouldCompileTo('{{#each array}}{{@index}}{{.}}{{/each}}', {array: array}, '1foo3bar');
});
+
+ it('should support multiple levels of inline partials', function() {
+ var string = '{{#> layout}}{{#*inline "subcontent"}}subcontent{{/inline}}{{/layout}}';
+ var partials = {
+ doctype: 'doctype{{> content}}',
+ layout: '{{#> doctype}}{{#*inline "content"}}layout{{> subcontent}}{{/inline}}{{/doctype}}'
+ };
+ shouldCompileToWithPartials(string, [{}, {}, partials], true, 'doctypelayoutsubcontent');
+ });
});