Merge pull request #11577 from ef4/fix-11539

Fix view destruction inside outlets
emberjs · Jun 29, 2015 · 922e2da · 922e2da
2 parents 8102ab2 + 1fc7811
commit 922e2da
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/packages/ember-htmlbars/lib/keywords/real_outlet.js b/packages/ember-htmlbars/lib/keywords/real_outlet.js
@@ -25,7 +25,11 @@ export default {
       toRender.template = topLevelViewTemplate;
     }
 
-    return { outletState: selectedOutletState, hasParentOutlet: env.hasParentOutlet };
+    return {
+      outletState: selectedOutletState,
+      hasParentOutlet: env.hasParentOutlet,
+      manager: state.manager
+    };
   },
 
   childEnv(state, env) {
@@ -68,6 +72,11 @@ export default {
       Ember.Logger.info('Rendering ' + toRender.name + ' with ' + ViewClass, { fullName: 'view:' + toRender.name });
     }
 
+    if (state.manager) {
+      state.manager.destroy();
+      state.manager = null;
+    }
+
     var nodeManager = ViewNodeManager.create(renderNode, env, {}, options, parentView, null, null, template);
     state.manager = nodeManager;
 

diff --git a/packages/ember-htmlbars/lib/node-managers/view-node-manager.js b/packages/ember-htmlbars/lib/node-managers/view-node-manager.js
@@ -150,7 +150,10 @@ ViewNodeManager.prototype.rerender = function(env, attrs, visitor) {
 };
 
 ViewNodeManager.prototype.destroy = function() {
-  this.component.destroy();
+  if (this.component) {
+    this.component.destroy();
+    this.component = null;
+  }
 };
 
 function getTemplate(componentOrView) {

diff --git a/packages/ember-metal-views/lib/renderer.js b/packages/ember-metal-views/lib/renderer.js
@@ -210,7 +210,7 @@ Renderer.prototype.renderElementRemoval =
     if (view._willRemoveElement) {
       view._willRemoveElement = false;
 
-      if (view._renderNode) {
+      if (view._renderNode && view.element && view.element.parentNode) {
         view._renderNode.clear();
       }
       this.didDestroyElement(view);

diff --git a/packages/ember-routing-htmlbars/tests/helpers/outlet_test.js b/packages/ember-routing-htmlbars/tests/helpers/outlet_test.js
@@ -322,6 +322,31 @@ QUnit.test('{{outlet}} should rerender when bound name changes', function() {
   equal(top.$().text().trim(), 'second');
 });
 
+QUnit.test('views created by {{outlet}} should get destroyed', function() {
+  let inserted = 0;
+  let destroyed = 0;
+  var routerState = {
+    render: {
+      ViewClass: EmberView.extend({
+        didInsertElement() {
+          inserted++;
+        },
+        willDestroyElement() {
+          destroyed++;
+        }
+      })
+    },
+    outlets: {}
+  };
+  top.setOutletState(routerState);
+  runAppend(top);
+  equal(inserted, 1, 'expected to see view inserted');
+  run(function() {
+    top.setOutletState(withTemplate('hello world'));
+  });
+  equal(destroyed, 1, 'expected to see view destroyed');
+});
+
 
 function withTemplate(string) {
   return {