avoid directive updates when component is being destroyed

yyx990803 · yyx990803 · commit d2db82f479d6 · 2014-11-04T17:53:18.000-05:00
diff --git a/src/directive.js b/src/directive.js
@@ -75,7 +75,7 @@ p._bind = function (def) {
     // wrapped updater for context
     var dir = this
     var update = this._update = function (val, oldVal) {
-      if (!dir._locked) {
+      if (!dir._locked && !dir.vm._isBeingDestroyed) {
         dir.update(val, oldVal)
       }
     }
diff --git a/src/directives/component.js b/src/directives/component.js
@@ -128,6 +128,10 @@ module.exports = {
         }
       }
       if (remove) {
+        // setting the "being destroyed" flag before
+        // removing to avoid content being changed during
+        // transitions
+        child._isBeingDestroyed = true
         child.$remove(destroy)
       } else {
         destroy()
diff --git a/test/unit/specs/directive_spec.js b/test/unit/specs/directive_spec.js
@@ -177,4 +177,17 @@ describe('Directive', function () {
     })
   })
 
+  it('avoid update when vm is being destroyed', function (done) {
+    var d = new Directive('test', el, vm, {
+      expression: 'a',
+    }, def)
+    expect(def.update.calls.count()).toBe(1)
+    vm._isBeingDestroyed = true
+    vm.a = 2
+    nextTick(function () {
+      expect(def.update.calls.count()).toBe(1)
+      done()
+    })
+  })
+
 })

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ p._bind = function (def) {`
`75`	`75`	`// wrapped updater for context`
`76`	`76`	`var dir = this`
`77`	`77`	`var update = this._update = function (val, oldVal) {`
`78`		`- if (!dir._locked) {`
	`78`	`+ if (!dir._locked && !dir.vm._isBeingDestroyed) {`
`79`	`79`	`dir.update(val, oldVal)`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,10 @@ module.exports = {`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`	`if (remove) {`
	`131`	`+ // setting the "being destroyed" flag before`
	`132`	`+ // removing to avoid content being changed during`
	`133`	`+ // transitions`
	`134`	`+ child._isBeingDestroyed = true`
`131`	`135`	`child.$remove(destroy)`
`132`	`136`	`} else {`
`133`	`137`	`destroy()`