fix watcher accidentally clearing watcherList on teardown (fix vuejs#806)

yyx990803 · yyx990803 · commit e9670d59b037 · 2015-04-25T18:07:57.000-04:00
diff --git a/src/watcher.js b/src/watcher.js
@@ -222,7 +222,10 @@ p.teardown = function () {
     // which can improve teardown performance.
     if (!this.vm._isBeingDestroyed) {
       var list = this.vm._watcherList
-      list.splice(list.indexOf(this))
+      var i = list.indexOf(this)
+      if (i > -1) {
+        list.splice(i, 1)
+      }
     }
     for (var id in this.deps) {
       this.deps[id].removeSub(this)
diff --git a/test/unit/specs/directives/model_spec.js b/test/unit/specs/directives/model_spec.js
@@ -233,7 +233,7 @@ if (_.inBrowser) {
         expect(opts[1].selected).toBe(false)
         // should teardown option watcher when unbind
         expect(vm._watcherList.length).toBe(2)
-        vm._directives[0].unbind()
+        vm._directives[0]._teardown()
         expect(vm._watcherList.length).toBe(0)
         done()
       })
