修正组件dispose

Author: RubyLouvre

dist/avalon.js

@@ -3,7 +3,7 @@ describe('测试component模块', function () {
 
     describe('onComponentDispose', function () {
         it('contains', function () {
-            var fn = avalon.onComponentDispose
+            var fn = avalon._disposeComponent
             expect(fn).to.be.a('function')
             var div = document.createElement('div')
             fn.byMutationEvent(div)

dist/avalon.modern.js

@@ -6,7 +6,6 @@ require('./vdom/compact')
 require('./dom/compact')
 require('./directives/compact')
 require('./strategy/index')
-avalon.onComponentDispose = require('./component/dispose.compact')
 require('./vmodel/compact')
 
 module.exports = avalon

dist/avalon.next.js

@@ -6,6 +6,5 @@ require('./dom/modern')
 require('./directives/modern')
 require('./strategy/index')
 require('./vmodel/modern')
-avalon.onComponentDispose = require('./component/dispose.compact')
 
 module.exports = avalon

dist/avalon.test.js

@@ -6,7 +6,5 @@ require('./dom/modern')
 require('./directives/modern')
 require('./strategy/index')
 require('./vmodel/next')
-avalon.onComponentDispose = require('./component/dispose.compact')
-
 
 module.exports = avalon

karma/component/index.js

@@ -1,7 +1,66 @@
-var ret = require('./dispose.share')
-var fireDisposeHook = ret.fireDisposeHook
-var fireDisposeHooks = ret.fireDisposeHooks
-var fireDisposeHookDelay = ret.fireDisposeHookDelay
+function inDomTree(el) {
+    while (el) {
+        if (el.nodeType === 9) {
+            return true
+        }
+        el = el.parentNode
+    }
+    return false
+}
+
+function fireDisposeHook(el) {
+    if (el.nodeType === 1 && el.getAttribute('wid') && !inDomTree(el)) {
+        var wid = el.getAttribute('wid')
+        var docker = avalon.scopes[ wid ]
+        if (!docker)
+            return
+        var vm = docker.vmodel
+        docker.vmodel.$fire("onDispose", {
+            type: 'dispose',
+            target: el,
+            vmodel: vm
+        })
+        if (docker && !el.getAttribute('cached')) {
+            delete docker.vmodel
+            delete avalon.scopes[ wid ]
+            var is = el.getAttribute('is')
+            var v = el.vtree
+            detachEvents(v)
+            if (v) {
+                v[0][is + '-mount'] = false
+                v[0]['component-ready:' + is] = false
+            }
+        }
+        return false
+    }
+}
+var rtag = /^\w/
+function detachEvents(arr) {
+    for (var i in arr) {
+        var el = arr[i]
+        if (rtag.test(el.nodeName)) {
+            for (var i in el) {
+                if (i.indexOf('ms-on') === 0) {
+                    delete el[i]
+                }
+            }
+            if (el.children) {
+                detachEvents(el.children)
+            }
+        }
+    }
+}
+function fireDisposeHookDelay(a) {
+    setTimeout(function () {
+        fireDisposeHook(a)
+    }, 4)
+}
+function fireDisposeHooks(nodes) {
+    for (var i = 0, el; el = nodes[i++]; ) {
+        fireDisposeHook(el)
+    }
+}
+
 
 
 //http://stackoverflow.com/questions/11425209/are-dom-mutation-observers-slower-than-dom-mutation-events

src/avalon.js

@@ -1,5 +1,7 @@
 var update = require('./_update')
-var tryInitComponent = require('../component/init')
+var initComponent = require('../component/init')
+var disposeComponent = require('../component/dispose')
+avalon._disposeComponent = disposeComponent
 
 avalon.component = function (name, definition) {
     //这是定义组件的分支,并将列队中的同类型对象移除
@@ -45,7 +47,7 @@ avalon.directive('widget', {
             //如果组件没有初始化,那么先初始化(生成对应的vm,$render)
             if (!src[vmName]) {
                 /* istanbul ignore if */
-                if (!tryInitComponent(src, copy[name], copy.local, copy.template)) {
+                if (!initComponent(src, copy[name], copy.local, copy.template)) {
                     //替换成注释节点
                     src.nodeValue = 'unresolved component placeholder'
                     copyList[index] = src
@@ -153,7 +155,7 @@ avalon.directive('widget', {
 
         vdom.dom = vm.$element = com
         com.vtree = [vdom]
-        avalon.onComponentDispose(com)
+        disposeComponent(com)
         vdom['component-ready:' + is] = true
         //--------------
         avalon.scopes[vm.$id] = {