From 84ed1f5f55faa9f50935b66b38826e138a111e0d Mon Sep 17 00:00:00 2001 From: Nils Knappmeier Date: Tue, 14 Feb 2017 23:10:02 +0100 Subject: [PATCH] Merge branch '4.x' # Conflicts: # Gruntfile.js # lib/handlebars/exception.js # spec/partials.js # spec/regressions.js --- lib/handlebars/runtime.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/handlebars/runtime.js b/lib/handlebars/runtime.js index eb5789fc2..310b108e0 100644 --- a/lib/handlebars/runtime.js +++ b/lib/handlebars/runtime.js @@ -197,12 +197,7 @@ export function wrapProgram(container, i, fn, data, declaredBlockParams, blockPa export function resolvePartial(partial, context, options) { if (!partial) { if (options.name === '@partial-block') { - let data = options.data; - while (data['partial-block'] === noop) { - data = data._parent; - } - partial = data['partial-block']; - data['partial-block'] = noop; + partial = options.data['partial-block']; } else { partial = options.partials[options.name]; }