Merge pull request #1243 from lawnsea/nested-partial-blocksHEADorigin/masterorigin/HEADmaster

Walk up data frames for nested @partial-block

1 files changed, 6 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];
     }