fix attach/detach hooks for transcluded components

yyx990803 · yyx990803 · commit 3f943c6f8a7f · 2015-02-02T13:20:59.000-05:00
diff --git a/src/instance/compile.js b/src/instance/compile.js
@@ -39,10 +39,12 @@ exports._compile = function (el) {
       parentOptions._skipAttrs = null
 
       if (content) {
+        var ol = parent._children.length
         var contentLinkFn =
           compile(content, parentOptions, true)
         // call content linker now, before transclusion
         this._contentUnlinkFn = contentLinkFn(parent, content)
+        this._transCpnts = parent._children.slice(ol)
       }
       // tranclude, this possibly replaces original
       el = transclude(el, options)
@@ -176,6 +178,7 @@ exports._cleanup = function () {
   this.$parent =
   this.$root =
   this._children =
+  this._transCpnts =
   this._directives = null
   // call the last hook...
   this._isDestroyed = true
diff --git a/src/instance/events.js b/src/instance/events.js
@@ -79,12 +79,21 @@ exports._initDOMHooks = function () {
 
 function onAttached () {
   this._isAttached = true
-  var children = this._children
-  for (var i = 0, l = children.length; i < l; i++) {
-    var child = children[i]
-    if (!child._isAttached && inDoc(child.$el)) {
-      child._callHook('attached')
-    }
+  this._children.forEach(callAttach)
+  if (this._transCpnts) {
+    this._transCpnts.forEach(callAttach)
+  }
+}
+
+/**
+ * Iterator to call attached hook
+ * 
+ * @param {Vue} child
+ */
+
+function callAttach (child) {
+  if (!child._isAttached && inDoc(child.$el)) {
+    child._callHook('attached')
   }
 }
 
@@ -94,12 +103,21 @@ function onAttached () {
 
 function onDetached () {
   this._isAttached = false
-  var children = this._children
-  for (var i = 0, l = children.length; i < l; i++) {
-    var child = children[i]
-    if (child._isAttached && !inDoc(child.$el)) {
-      child._callHook('detached')
-    }
+  this._children.forEach(callDetach)
+  if (this._transCpnts) {
+    this._transCpnts.forEach(callDetach)
+  }
+}
+
+/**
+ * Iterator to call detached hook
+ * 
+ * @param {Vue} child
+ */
+
+function callDetach (child) {
+  if (child._isAttached && !inDoc(child.$el)) {
+    child._callHook('detached')
   }
 }
 
diff --git a/src/instance/init.js b/src/instance/init.js
@@ -48,6 +48,8 @@ exports._init = function (options) {
   // children
   this._children = []
   this._childCtors = {}
+  // transcluded components that belong to the parent
+  this._transCpnts = null
 
   // merge options.
   options = this.$options = mergeOptions(
