fix vuejs#276 and vuejs#281 child vms removed before parent transition finishes

Evan You · Evan You · commit 108122b5ea3e · 2014-05-27T18:53:52.000-04:00
diff --git a/src/compiler.js b/src/compiler.js
@@ -921,7 +921,7 @@ CompilerProto.resolveComponent = function (node, data, test) {
 /**
  *  Unbind and remove element
  */
-CompilerProto.destroy = function () {
+CompilerProto.destroy = function (noRemove) {
 
     // avoid being called more than once
     // this is irreversible!
@@ -942,6 +942,14 @@ CompilerProto.destroy = function () {
     // unobserve data
     Observer.unobserve(compiler.data, '', compiler.observer)
 
+    // destroy all children
+    // do not remove their elements since the parent
+    // may have transitions and the children may not
+    i = children.length
+    while (i--) {
+        children[i].destroy(true)
+    }
+
     // unbind all direcitves
     i = directives.length
     while (i--) {
@@ -974,23 +982,19 @@ CompilerProto.destroy = function () {
         }
     }
 
-    // destroy all children
-    i = children.length
-    while (i--) {
-        children[i].destroy()
-    }
-
     // remove self from parent
     if (parent) {
         j = parent.children.indexOf(compiler)
         if (j > -1) parent.children.splice(j, 1)
     }
 
     // finally remove dom element
-    if (el === document.body) {
-        el.innerHTML = ''
-    } else {
-        vm.$remove()
+    if (!noRemove) {
+        if (el === document.body) {
+            el.innerHTML = ''
+        } else {
+            vm.$remove()
+        }
     }
     el.vue_vm = null
 
