revert 3333598: fix memory leak when replacing arrays

yyx990803 · yyx990803 · commit 18c8629844fb · 2015-10-27T13:53:47.000-04:00
diff --git a/src/observer/array.js b/src/observer/array.js
@@ -28,7 +28,7 @@ var arrayMethods = Object.create(arrayProto)
     }
     var result = original.apply(this, args)
     var ob = this.__ob__
-    var inserted, removed
+    var inserted
     switch (method) {
       case 'push':
         inserted = args
@@ -38,17 +38,11 @@ var arrayMethods = Object.create(arrayProto)
         break
       case 'splice':
         inserted = args.slice(2)
-        removed = result
-        break
-      case 'pop':
-      case 'shift':
-        removed = [result]
         break
     }
     if (inserted) ob.observeArray(inserted)
-    if (removed) ob.unobserveArray(removed)
     // notify change
-    ob.notify()
+    ob.dep.notify()
     return result
   })
 })
diff --git a/src/observer/index.js b/src/observer/index.js
@@ -91,42 +91,7 @@ Observer.prototype.walk = function (obj) {
 Observer.prototype.observeArray = function (items) {
   var i = items.length
   while (i--) {
-    var ob = Observer.create(items[i])
-    if (ob) {
-      (ob.parents || (ob.parents = [])).push(this)
-    }
-  }
-}
-
-/**
- * Remove self from the parent list of removed objects.
- *
- * @param {Array} items
- */
-
-Observer.prototype.unobserveArray = function (items) {
-  var i = items.length
-  while (i--) {
-    var ob = items[i] && items[i].__ob__
-    if (ob) {
-      ob.parents.$remove(this)
-    }
-  }
-}
-
-/**
- * Notify self dependency, and also parent Array dependency
- * if any.
- */
-
-Observer.prototype.notify = function () {
-  this.dep.notify()
-  var parents = this.parents
-  if (parents) {
-    var i = parents.length
-    while (i--) {
-      parents[i].notify()
-    }
+    Observer.create(items[i])
   }
 }
 
@@ -217,6 +182,12 @@ function defineReactive (obj, key, val) {
         if (childOb) {
           childOb.dep.depend()
         }
+        if (_.isArray(val)) {
+          for (var e, i = 0, l = val.length; i < l; i++) {
+            e = val[i]
+            e && e.__ob__ && e.__ob__.dep.depend()
+          }
+        }
       }
       return val
     },
diff --git a/src/util/lang.js b/src/util/lang.js
@@ -24,7 +24,7 @@ exports.set = function set (obj, key, val) {
     return
   }
   ob.convert(key, val)
-  ob.notify()
+  ob.dep.notify()
   if (ob.vms) {
     var i = ob.vms.length
     while (i--) {
@@ -51,7 +51,7 @@ exports.delete = function (obj, key) {
   if (!ob) {
     return
   }
-  ob.notify()
+  ob.dep.notify()
   if (ob.vms) {
     var i = ob.vms.length
     while (i--) {
