fix #636 and v-ref for real

Author: yyx990803

src/directives/component.js

@@ -34,8 +34,9 @@ module.exports = {
       // if static, build right now.
       if (!this._isDynamicLiteral) {
         this.resolveCtor(this.expression)
-        this.childVM = this.build()
-        this.childVM.$before(this.ref)
+        var child = this.build()
+        child.$before(this.ref)
+        this.setCurrent(child)
       } else {
         // check dynamic component params
         this.readyEvent = this._checkParam('wait-for')
@@ -85,10 +86,6 @@ module.exports = {
       if (this.keepAlive) {
         this.cache[this.ctorId] = child
       }
-      var refID = child._refID || this.refID
-      if (refID) {
-        vm.$[refID] = child
-      }
       return child
     }
   },
@@ -100,10 +97,6 @@ module.exports = {
 
   unbuild: function () {
     var child = this.childVM
-    var refID = (child && child._refID) || this.refID
-    if (refID) {
-      this.vm.$[refID] = null
-    }
     if (!child || this.keepAlive) {
       return
     }
@@ -120,8 +113,7 @@ module.exports = {
    * @param {Function} cb
    */
 
-  removeCurrent: function (cb) {
-    var child = this.childVM
+  remove: function (child, cb) {
     var keepAlive = this.keepAlive
     if (child) {
       child.$remove(function () {
@@ -142,8 +134,8 @@ module.exports = {
     if (!value) {
       // just destroy and remove current
       this.unbuild()
-      this.removeCurrent()
-      this.childVM = null
+      this.remove(this.childVM)
+      this.unsetCurrent()
     } else {
       this.resolveCtor(value)
       this.unbuild()
@@ -168,23 +160,48 @@ module.exports = {
 
   swapTo: function (target) {
     var self = this
+    var current = this.childVM
+    this.unsetCurrent()
+    this.setCurrent(target)
     switch (self.transMode) {
       case 'in-out':
         target.$before(self.ref, function () {
-          self.removeCurrent()
-          self.childVM = target
+          self.remove(current)
         })
         break
       case 'out-in':
-        self.removeCurrent(function () {
+        self.remove(current, function () {
           target.$before(self.ref)
-          self.childVM = target
         })
         break
       default:
-        self.removeCurrent()
+        self.remove(current)
         target.$before(self.ref)
-        self.childVM = target
+    }
+  },
+
+  /**
+   * Set childVM and parent ref
+   */
+  
+  setCurrent: function (child) {
+    this.childVM = child
+    var refID = child._refID || this.refID
+    if (refID) {
+      this.vm.$[refID] = child
+    }
+  },
+
+  /**
+   * Unset childVM and parent ref
+   */
+
+  unsetCurrent: function () {
+    var child = this.childVM
+    this.childVM = null
+    var refID = (child && child._refID) || this.refID
+    if (refID) {
+      this.vm.$[refID] = null
     }
   },