vsn 0.1.138 → 0.1.139

package/src/DOM/DOMObject.ts

@@ -71,7 +71,6 @@ export abstract class DOMObject extends EventDispatcher {
         if (this.element) {
             this.element[Tag.TaggedVariable] = null;
             this.element[ClassNode.ClassesVariable] = null;
-            (this as any).element = null;
         }
         super.deconstruct();
     }

package/src/EventDispatcher.ts

@@ -51,8 +51,9 @@ export class EventDispatcher  {
     deconstruct() {
         this.dispatch('deconstruct', this);
         const sourceIndex = EventDispatcher.sources.indexOf(this);
-        if (sourceIndex > -1)
+        if (sourceIndex > -1) {
             EventDispatcher.sources.splice(sourceIndex, 1);
+        }
 
         for (const k in this._listeners) {
             for (const cb of this._listeners[k]) {

package/src/Scope/ScopeDataAbstract.ts

@@ -25,7 +25,7 @@ export class ScopeDataAbstract extends EventDispatcher {
     deconstruct() {
         super.deconstruct();
         this._lastData = null;
-        for (const prop of this.__properties__) {
+        for (const prop of Array.from(this.__properties__)) {
             this.removeProperty(prop);
         }
         this.__properties__.length = 0;
@@ -39,6 +39,7 @@ export class ScopeDataAbstract extends EventDispatcher {
         if (this.hasProperty(name)) {
             return this.getProperty(name);
         }
+
         config = config || {};
         const instance = new propertyType(config.default, config);
         const propDesc = Object.getOwnPropertyDescriptor(this, name);

package/src/Scope.ts

@@ -29,6 +29,7 @@ export class Scope extends ScopeAbstract {
     deconstruct() {
         super.deconstruct();
         this.collectGarbage(true);
+
         this.wrapped = null;
         if (this._data)
             this._data.deconstruct();
@@ -38,11 +39,7 @@ export class Scope extends ScopeAbstract {
             child.deconstruct();
         }
         this.children.length = 0;
-
-        if (this._parentScope) {
-            this._parentScope.removeChild(this);
-            this._parentScope = null;
-        }
+        this.parentScope = null;
     }
 
     public get data(): ScopeData {

package/src/Tag.ts

@@ -19,6 +19,7 @@ export enum TagState {
     AttributesExtracted,
     AttributesConnected,
     Built,
+    Deconstructed,
 }
 
 export class Tag extends DOMObject {
@@ -622,6 +623,9 @@ export class Tag extends DOMObject {
     }
 
     protected handleEvent(eventType: string, e) {
+        if (this.state === TagState.Deconstructed)
+            return
+
         if (e)
             e.stopPropagation();
 
@@ -662,8 +666,6 @@ export class Tag extends DOMObject {
                 handler.handler.call(handler.context, e);
             }
         }
-        this.scope.remove('$event');
-        this.scope.remove('$value');
     }
 
     public hasModifier(attribute: string, modifier: string): boolean {
@@ -813,6 +815,7 @@ export class Tag extends DOMObject {
     }
 
     deconstruct() {
+        this._state = TagState.Deconstructed
         const dom = this.dom || DOM.instance;
         if (dom) {
             dom.removedQueued(this.element);

package/src/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = '0.1.138';
+export const VERSION = '0.1.139';