move recursion from inside of renderer into ContainerView which is th…

…e only thing that seems to need this
emberjs · Jun 12, 2015 · 3448c68 · 3448c68
1 parent 378a6e5
commit 3448c68
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/packages/ember-metal-views/lib/renderer.js b/packages/ember-metal-views/lib/renderer.js
@@ -231,14 +231,7 @@ Renderer.prototype.willDestroyElement = function (view) {
   }
 
   if (view._transitionTo) {
-    view._transitionTo('destroying', false);
-  }
-
-  var childViews = view.childViews;
-  if (childViews) {
-    for (var i = 0; i < childViews.length; i++) {
-      this.willDestroyElement(childViews[i]);
-    }
+    view._transitionTo('destroying');
   }
 };
 
@@ -253,11 +246,8 @@ Renderer.prototype.didDestroyElement = function (view) {
     view._transitionTo('preRender');
   }
 
-  var childViews = view.childViews;
-  if (childViews) {
-    for (var i = 0; i < childViews.length; i++) {
-      this.didDestroyElement(childViews[i]);
-    }
+  if (view.trigger) {
+    view.trigger('didDestroyElement');
   }
 }; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
 

diff --git a/packages/ember-views/lib/mixins/view_state_support.js b/packages/ember-views/lib/mixins/view_state_support.js
@@ -2,12 +2,12 @@ import Ember from 'ember-metal/core';
 import { Mixin } from "ember-metal/mixin";
 
 var ViewStateSupport = Mixin.create({
-  transitionTo(state, children) {
+  transitionTo(state) {
     Ember.deprecate("Ember.View#transitionTo has been deprecated, it is for internal use only");
-    this._transitionTo(state, children);
+    this._transitionTo(state);
   },
 
-  _transitionTo(state, children) {
+  _transitionTo(state) {
     var priorState = this.currentState;
     var currentState = this.currentState = this._states[state];
     this._state = state;

diff --git a/packages/ember-views/lib/views/container_view.js b/packages/ember-views/lib/views/container_view.js
@@ -9,6 +9,7 @@ import {
   observer,
   beforeObserver
 } from "ember-metal/mixin";
+import { on } from "ember-metal/events";
 
 import containerViewTemplate from "ember-htmlbars/templates/container-view";
 containerViewTemplate.meta.revision = 'Ember@VERSION_STRING_PLACEHOLDER';
@@ -280,8 +281,26 @@ var ContainerView = View.extend(MutableArray, {
   },
 
   objectAt(idx) {
-    return get(this, 'childViews')[idx];
-  }
+    return this.childViews[idx];
+  },
+
+  _triggerChildWillDestroyElement: on('willDestroyElement', function () {
+    var childViews = this.childViews;
+    if (childViews) {
+      for (var i = 0; i < childViews.length; i++) {
+        this.renderer.willDestroyElement(childViews[i]);
+      }
+    }
+  }),
+
+  _triggerChildDidDestroyElement: on('didDestroyElement', function () {
+    var childViews = this.childViews;
+    if (childViews) {
+      for (var i = 0; i < childViews.length; i++) {
+        this.renderer.didDestroyElement(childViews[i]);
+      }
+    }
+  })
 });
 
 export default ContainerView;