use $remove everywhere

Author: yyx990803

src/compiler/compile.js

@@ -98,10 +98,7 @@ function teardownDirs (vm, dirs) {
   var i = dirs.length
   while (i--) {
     dirs[i]._teardown()
-  }
-  i = vm._directives.indexOf(dirs[0])
-  if (i > -1) {
-    vm._directives.splice(i, dirs.length)
+    vm._directives.$remove(dirs[i])
   }
 }
 

src/instance/compile.js

@@ -95,14 +95,12 @@ exports._destroy = function (remove, deferCleanup) {
   // if parent is not being destroyed as well.
   var parent = this.$parent
   if (parent && !parent._isBeingDestroyed) {
-    i = parent._children.indexOf(this)
-    parent._children.splice(i, 1)
+    parent._children.$remove(this)
   }
   // same for transclusion host.
   var host = this._host
   if (host && !host._isBeingDestroyed) {
-    i = host._transCpnts.indexOf(this)
-    host._transCpnts.splice(i, 1)
+    host._transCpnts.$remove(this)
   }
   // destroy all children.
   i = this._children.length

src/observer/array.js

@@ -78,11 +78,12 @@ _.define(
   arrayProto,
   '$remove',
   function $remove (index) {
+    if (!this.length) return
     if (typeof index !== 'number') {
       index = this.indexOf(index)
     }
     if (index > -1) {
-      return this.splice(index, 1)[0]
+      this.splice(index, 1)
     }
   }
 )

src/observer/dep.js

@@ -32,10 +32,7 @@ p.addSub = function (sub) {
  */
 
 p.removeSub = function (sub) {
-  if (this.subs.length) {
-    var i = this.subs.indexOf(sub)
-    if (i > -1) this.subs.splice(i, 1)
-  }
+  this.subs.$remove(sub)
 }
 
 /**

src/observer/index.js

@@ -180,8 +180,7 @@ p.convert = function (key, val) {
       // remove dep from old value
       var oldChildOb = val && val.__ob__
       if (oldChildOb) {
-        var oldDeps = oldChildOb.deps
-        oldDeps.splice(oldDeps.indexOf(dep), 1)
+        oldChildOb.deps.$remove(dep)
       }
       val = newVal
       // add dep to new value
@@ -229,7 +228,7 @@ p.addVm = function (vm) {
  */
 
 p.removeVm = function (vm) {
-  this.vms.splice(this.vms.indexOf(vm), 1)
+  this.vms.$remove(vm)
 }
 
 module.exports = Observer

src/watcher.js

@@ -202,10 +202,7 @@ p.addCb = function (cb) {
 p.removeCb = function (cb) {
   var cbs = this.cbs
   if (cbs.length > 1) {
-    var i = cbs.indexOf(cb)
-    if (i > -1) {
-      cbs.splice(i, 1)
-    }
+    cbs.$remove(cb)
   } else if (cb === cbs[0]) {
     this.teardown()
   }
@@ -221,11 +218,7 @@ p.teardown = function () {
     // we can skip this if the vm if being destroyed
     // which can improve teardown performance.
     if (!this.vm._isBeingDestroyed) {
-      var list = this.vm._watcherList
-      var i = list.indexOf(this)
-      if (i > -1) {
-        list.splice(i, 1)
-      }
+      this.vm._watcherList.$remove(this)
     }
     for (var id in this.deps) {
       this.deps[id].removeSub(this)