summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/handlebars/runtime.js7
-rw-r--r--spec/partials.js14
2 files changed, 20 insertions, 1 deletions
diff --git a/lib/handlebars/runtime.js b/lib/handlebars/runtime.js
index 55eb1c1..7426f1f 100644
--- a/lib/handlebars/runtime.js
+++ b/lib/handlebars/runtime.js
@@ -197,7 +197,12 @@ export function wrapProgram(container, i, fn, data, declaredBlockParams, blockPa
export function resolvePartial(partial, context, options) {
if (!partial) {
if (options.name === '@partial-block') {
- partial = options.data['partial-block'];
+ let data = options.data;
+ while (data['partial-block'] === noop) {
+ data = data._parent;
+ }
+ partial = data['partial-block'];
+ data['partial-block'] = noop;
} else {
partial = options.partials[options.name];
}
diff --git a/spec/partials.js b/spec/partials.js
index d3ead74..07d1c0d 100644
--- a/spec/partials.js
+++ b/spec/partials.js
@@ -270,6 +270,20 @@ describe('partials', function() {
true,
'success');
});
+ it('should render nested partial blocks', function() {
+ shouldCompileToWithPartials(
+ '.template-start.{{#> outer}}{{value}}{{/outer}}.template-end.',
+ [
+ {value: 'success'},
+ {},
+ {
+ outer: '.outer-start.{{#> nested}}.outer-partial-block-start.{{> @partial-block}}.outer-partial-block-end.{{/nested}}.outer-end.',
+ nested: '.nested-start.{{> @partial-block}}.nested-end.'
+ }
+ ],
+ true,
+ '.template-start..outer-start..nested-start..outer-partial-block-start.success.outer-partial-block-end..nested-end..outer-end..template-end.');
+ });
});
describe('inline partials', function() {