处理内存泄露问题

Author: RubyLouvre

src/component/index.js

@@ -75,9 +75,9 @@ avalon.directive('widget', {
             this.comVm = comVm
 
             // ＝＝＝创建组件的VM＝＝END＝＝＝
-            var boss = avalon.scan(component.template, comVm)
-            comVm.$render = boss
-            replaceRoot(this, boss)
+            var innerRender = avalon.scan(component.template, comVm)
+            comVm.$render = innerRender
+            replaceRoot(this, innerRender)
             var nodesWithSlot = []
             var directives = []
             if (this.fragment || component.soleSlot) {
@@ -87,11 +87,12 @@ avalon.directive('widget', {
                     nodesWithSlot = this.root.children
                 })
                 directives = childBoss.directives
+                this.childBoss= childBoss
                 for (var i in childBoss) {
                     delete childBoss[i]
                 }
             }
-            boss.directives.push.apply(boss.directives, directives)
+            Array.prototype.push.apply(innerRender.directives, directives)
 
             var arraySlot = [],
                 objectSlot = {}
@@ -120,16 +121,16 @@ avalon.directive('widget', {
             }
             //将原来元素的所有孩子，全部移动新的元素的第一个slot的位置上
             if (component.soleSlot) {
-                insertArraySlot(boss.vnodes, arraySlot)
+                insertArraySlot(innerRender.vnodes, arraySlot)
             } else {
-                insertObjectSlot(boss.vnodes, objectSlot)
+                insertObjectSlot(innerRender.vnodes, objectSlot)
             }
         }
 
         if (comment) {
             var dom = avalon.vdom(vdom, 'toDOM')
             comment.parentNode.replaceChild(dom, comment)
-            comVm.$element = boss.root.dom = dom
+            comVm.$element = innerRender.root.dom = dom
             delete this.reInit
         }
 
@@ -141,24 +142,13 @@ avalon.directive('widget', {
         } else {
             fireComponentHook(comVm, vdom, 'Ready')
         }
-        this.beforeDispose = function() {
-            if (!this.cacheVm) {
-                fireComponentHook(comVm, vdom, 'Dispose')
-                comVm.$hashcode = false
-                delete avalon.vmodels[comVm.$id]
-                this.boss.dispose()
-            } else {
-                fireComponentHook(comVm, vdom, 'Leave')
-            }
-
-        }
-
     },
     diff: function(newVal, oldVal) {
         if (cssDiff.call(this, newVal, oldVal)) {
             return true
         }
     },
+
     update: function(vdom, value) {
         this.oldValue = value //★★防止递归
         switch (this.readyState) {
@@ -187,18 +177,29 @@ avalon.directive('widget', {
                 delete avalon.viewChanging
                 break
         }
-    }
+    },
+    beforeDispose: function() {
+        var comVm = this.comVm
+        if (!this.cacheVm) {
+            fireComponentHook(comVm, this.node, 'Dispose')
+            comVm.$hashcode = false
+            delete avalon.vmodels[comVm.$id]
+            this.innerRender && this.innerRender.dispose()
+        } else {
+            fireComponentHook(comVm, this.node, 'Leave')
+        }
+    },
 })
 
-function replaceRoot(instance, boss) {
-    instance.boss = boss
-    var root = boss.root
+function replaceRoot(instance, innerRender) {
+    instance.innerRender = innerRender
+    var root = innerRender.root
     var vdom = instance.node
     for (var i in root) {
         vdom[i] = root[i]
     }
-    boss.root = vdom
-    boss.vnodes[0] = vdom
+    innerRender.root = vdom
+    innerRender.vnodes[0] = vdom
 }
 
 function fireComponentHook(vm, vdom, name) {

src/directives/for.js

@@ -86,6 +86,11 @@ avalon.directive('for', {
             })
         }
         delete this.updating
+    },
+    beforeDispose: function(){
+        this.fragments.forEach(function(el){
+            el.dispose
+        })
     }
 })
 
@@ -138,13 +143,13 @@ function diffList(instance) {
     var list = instance.preFragments
 
     list.forEach(function(el) {
-        el._destory = true
+        el._dispose = true
     })
     instance.fragments.forEach(function(c, index) {
         var fragment = isInCache(cache, c.key)
             //取出之前的文档碎片
         if (fragment) {
-            delete fragment._destory
+            delete fragment._dispose
             fragment.oldIndex = fragment.index
             fragment.index = index // 相当于 c.index
             fragment.vm[instance.keyName] = instance.isArray ? index : fragment.key
@@ -164,7 +169,7 @@ function diffList(instance) {
 
             fragment.vm[instance.valName] = val
             fragment.vm[instance.keyName] = instance.isArray ? index : fragment.key
-            delete fragment._destory
+            delete fragment._dispose
         } else {
             fragment = FragmentDecorator(c, instance, c.index)
             list.push(fragment)
@@ -186,10 +191,10 @@ function updateList(instance) {
     var list = instance.fragments
     var end = instance.end.dom
     for (var i = 0, item; item = list[i]; i++) {
-        if (item._destory) {
+        if (item._dispose) {
             list.splice(i, 1)
             i--
-            item.destory()
+            item.dispose()
             continue
         }
         if (item.oldIndex !== item.index) {
@@ -211,7 +216,7 @@ function updateList(instance) {
  * @param {type} fragment
  * @param {type} this
  * @param {type} index
- * @returns { key, val, index, oldIndex, this, dom, split, boss, vm}
+ * @returns { key, val, index, oldIndex, this, dom, split, vm}
  */
 function FragmentDecorator(fragment, instance, index) {
     var data = {}
@@ -235,7 +240,7 @@ function FragmentDecorator(fragment, instance, index) {
         })
     }
     fragment.index = index
-    fragment.boss = avalon.scan(instance.fragment, vm, function() {
+    fragment.innerRender = avalon.scan(instance.fragment, vm, function() {
         var oldRoot = this.root
         ap.push.apply(fragment.children, oldRoot.children)
         this.root = fragment

src/directives/html.js

@@ -3,19 +3,23 @@ import { avalon } from '../seed/core'
 avalon.directive('html', {
 
     update: function(vdom, value) {
-        this.boss && this.boss.dispose()
-      
-        this.boss = avalon.scan('<div class="ms-html-container">' + value + '</div>', this.vm, function() {
-            
-           
+        this.beforeDispose()
+
+        this.innerRender = avalon.scan('<div class="ms-html-container">' + value + '</div>', this.vm, function() {
             var oldRoot = this.root
-            vdom.children.splice(0)
+            if(vdom.children)
+               vdom.children.splice(0)
             vdom.children = oldRoot.children
             this.root = vdom
-            if(vdom.dom)
-            avalon.clearHTML(vdom.dom)
+            if (vdom.dom)
+                avalon.clearHTML(vdom.dom)
         })
-       
+
+    },
+    beforeDispose: function() {
+        if (this.innerRender) {
+            this.innerRender.dispose()
+        }
     },
     delay: true
 })

src/directives/if.js

@@ -9,7 +9,6 @@ avalon.directive('if', {
         delete props['ms-if']
         delete props[':if']
         this.fragment = avalon.vdom(this.node, 'toHTML')
-
     },
     diff: function(newVal, oldVal) {
         var n = !!newVal
@@ -31,7 +30,7 @@ avalon.directive('if', {
             continueScan(this, vdom)
             p && p.replaceChild(vdom.dom, placeholder)
         } else { //移除DOM
-            this.boss && this.boss.dispose()
+            this.beforeDispose()
             vdom.nodeValue = 'if'
             vdom.nodeName = '#comment'
             delete vdom.children
@@ -42,11 +41,16 @@ avalon.directive('if', {
                 p.replaceChild(placeholder, dom)
             }
         }
+    },
+    beforeDispose: function(){
+        if (this.innerRender) {
+            this.innerRender.dispose()
+        }
     }
 })
 
 function continueScan(instance, vdom) {
-    var boss = instance.boss = avalon.scan(instance.fragment, instance.vm)
-    avalon.shadowCopy(vdom, boss.root)
+    var innerRender = instance.innerRender = avalon.scan(instance.fragment, instance.vm)
+    avalon.shadowCopy(vdom, innerRender.root)
     delete vdom.nodeValue
 }

src/renders/domRender.js

@@ -323,7 +323,7 @@ class Render {
         for (var i = 0, el; el = list[i++];) {
             el.dispose()
         }
-        //防止其他地方的this.boss && this.boss.dispose报错
+        //防止其他地方的this.innerRender && this.innerRender.dispose报错
         for (var i in this) {
             if(i !== 'dispose')
                delete this[i]

src/vdom/VFragment.js

@@ -19,9 +19,9 @@ export class VFragment {
         this.split = f.lastChild
         return this.dom = f
     }
-    destory() {
+    dispose() {
         this.toFragment()
-        this.boss && this.boss.dispose()
+        this.innerRender && this.innerRender.dispose()
         for (var i in this) {
             this[i] = null
         }

src/vmodel/Action.js

@@ -104,7 +104,7 @@ export class Action {
             endBatch('schedule ' + this.expr)
         }
     }
-    removeDepends(filter) {
+    removeDepends() {
         var self = this
         this.observers.forEach(function(depend) {
             avalon.Array.remove(depend.observers, self)