Merge pull request #10352 from ebryn/remove-willdestroyelement-events

Add internal `_willDestroyElement` hook to prevent using instance-based events
emberjs · Feb 4, 2015 · 038f640 · 038f640
2 parents 4966110 + 4ac8e74
commit 038f640
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/ember-views/lib/system/renderer.js b/packages/ember-views/lib/system/renderer.js
@@ -127,6 +127,9 @@ Renderer.prototype.willRemoveElement = function (view) {};
 
 Renderer.prototype.willDestroyElement = function (view) {
   if (this._destinedForDOM) {
+    if (view._willDestroyElement) {
+      view._willDestroyElement();
+    }
     if (view.trigger) {
       view.trigger('willDestroyElement');
       view.trigger('willClearRender');

diff --git a/packages/ember-views/lib/views/view.js b/packages/ember-views/lib/views/view.js
@@ -128,10 +128,18 @@ var ViewStreamSupport = Mixin.create({
     return stream;
   },
 
+  _willDestroyElement: function() {
+    if (this._streamBindings) {
+      this._destroyStreamBindings();
+    }
+    if (this._contextStream) {
+      this._destroyContextStream();
+    }
+  },
+
   _getBindingForStream: function(pathOrStream) {
     if (this._streamBindings === undefined) {
       this._streamBindings = create(null);
-      this.one('willDestroyElement', this, this._destroyStreamBindings);
     }
 
     var path = pathOrStream;
@@ -170,7 +178,6 @@ var ViewStreamSupport = Mixin.create({
     if (this._contextStream === undefined) {
       this._baseContext = new KeyStream(this, 'context');
       this._contextStream = new ContextStream(this);
-      this.one('willDestroyElement', this, this._destroyContextStream);
     }
 
     return this._contextStream;