From ead073bd87a36e4e36d6260c435e5f7d5125eb43 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 3 Dec 2014 15:52:34 -0500 Subject: [PATCH] FIX: If we are scheduled after being torn down don't do anything --- vendor/assets/javascripts/ember-cloaking.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vendor/assets/javascripts/ember-cloaking.js b/vendor/assets/javascripts/ember-cloaking.js index 6c29634643f..c207d930749 100644 --- a/vendor/assets/javascripts/ember-cloaking.js +++ b/vendor/assets/javascripts/ember-cloaking.js @@ -329,6 +329,9 @@ }, updateChildView: function () { + // If the element has been destroyed before this call occurs + if (!this) { return; } + this._scheduled = false; if (!this._elementCreated || this.isDestroying || this.isDestroyed) { return; }