Merge pull request #10489 from ebryn/nested-yield-bug

[BUGFIX release] Fix an issue with bindings inside of a yielded template when the yield helper is nested inside of another view
emberjs · Feb 18, 2015 · 87195cf · 87195cf
2 parents ad2ca44 + c3bde6c
commit 87195cf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/packages/ember-htmlbars/lib/hooks/content.js b/packages/ember-htmlbars/lib/hooks/content.js
@@ -22,7 +22,7 @@ export default function content(env, morph, view, path) {
   }
 
   if (isStream(result)) {
-    appendSimpleBoundView(view, morph, result);
+    appendSimpleBoundView(env.data.view, morph, result);
   } else {
     morph.setContent(result);
   }

diff --git a/packages/ember-htmlbars/tests/helpers/yield_test.js b/packages/ember-htmlbars/tests/helpers/yield_test.js
@@ -284,6 +284,21 @@ QUnit.test("yield should work for views even if _parentView is null", function()
 
 });
 
+QUnit.test("simple bindings inside of a yielded template should work properly when the yield is nested inside of another view", function() {
+  view = EmberView.create({
+    layout:   compile('{{#if view.falsy}}{{else}}{{yield}}{{/if}}'),
+    template: compile("{{view.text}}"),
+    text: "ohai"
+  });
+
+  run(function() {
+    view.createElement();
+  });
+
+  equal(view.$().text(), "ohai");
+});
+
+
 QUnit.module("ember-htmlbars: Component {{yield}}", {
   setup: function() {},
   teardown: function() {