vsn 0.1.133 → 0.1.135

package/src/Scope.ts

@@ -26,6 +26,17 @@ export class Scope extends ScopeAbstract {
         this._data.addRelay(this);
     }
 
+    deconstruct() {
+        super.deconstruct();
+        this.collectGarbage(true);
+        this.wrapped = null;
+        if (this._data)
+            this._data.deconstruct();
+        this._data = null;
+        this.children.length = 0;
+        this._parentScope = null;
+    }
+
     public get data(): ScopeData {
         return this._data;
     }
@@ -105,6 +116,7 @@ export class Scope extends ScopeAbstract {
     }
 
     get(key: string, searchParents: boolean = true): any {
+        if (this._data === null) return null;
         const value: any = this._data[key];
         if (value === undefined) {
             if (searchParents && this.parentScope)
@@ -117,6 +129,7 @@ export class Scope extends ScopeAbstract {
     }
 
     set(key: string, value: any, detectType: boolean = false): void {
+        if (this._data === null) return;
         if (detectType) {
             const type = typeof value;
             if (type === 'number') {
@@ -135,11 +148,18 @@ export class Scope extends ScopeAbstract {
         this._data[key] = value;
     }
 
+    remove(key: string) {
+        if (this._data === null) return;
+        this._data.removeProperty(key);
+    }
+
     get keys(): string[] {
+        if (this._data === null) return [];
         return this._data.keys;
     }
 
     has(key: string): boolean {
+        if (this._data === null) return false;
         return this._data.hasProperty(key);
     }
 
@@ -186,11 +206,6 @@ export class Scope extends ScopeAbstract {
             this.cleanup();
     }
 
-    deconstruct() {
-        super.deconstruct();
-        this.collectGarbage(true);
-    }
-
     public wrap(toWrap: any, triggerUpdates: boolean = false, updateFromWrapped: boolean = true) {
         if (toWrap instanceof ScopeData) {
             if (this._data instanceof EventDispatcher) {

package/src/Tag.ts

@@ -79,6 +79,7 @@ export class Tag extends DOMObject {
         this.rawAttributes = {};
         this.parsedAttributes = {};
         this.onEventHandlers = {};
+        this.onEventBindings = {};
         this.analyzeElementAttributes();
         this._state = TagState.Instantiated;
     }
@@ -703,7 +704,8 @@ export class Tag extends DOMObject {
             if (eventType.indexOf('touch') > -1 || passiveValue !== null)
                 eventListenerOpts['passive'] = passiveValue === null && true || passiveValue;
 
-            element.addEventListener(eventType, this.handleEvent.bind(this, eventType), eventListenerOpts);
+
+            element.addEventListener(eventType, this.getEventBinding(eventType), eventListenerOpts);
         }
 
         this.onEventHandlers[eventType].push({
@@ -715,6 +717,13 @@ export class Tag extends DOMObject {
         });
     }
 
+    public getEventBinding(eventType: string) {
+        if (this.onEventBindings[eventType] === undefined)
+            this.onEventBindings[eventType] = this.handleEvent.bind(this, eventType);
+
+        return this.onEventBindings[eventType];
+    }
+
     public removeEventHandler(eventType: string, handler, context: any = null) {
         if (!this.onEventHandlers[eventType])
             return;
@@ -723,17 +732,16 @@ export class Tag extends DOMObject {
         if (_handler) {
             this.onEventHandlers[eventType].splice(this.onEventHandlers[eventType].indexOf(_handler), 1);
             if (this.onEventHandlers[eventType].length === 0) {
-                this.element.removeEventListener(eventType, this.handleEvent.bind(this, eventType));
+                this.element.removeEventListener(eventType, this.getEventBinding(eventType));
             }
         }
     }
 
     public removeAllEventHandlers() {
         for (const eventType of Object.keys(this.onEventHandlers)) {
-            for (const handler of this.onEventHandlers[eventType]) {
-                this.removeEventHandler(eventType, handler.handler, handler.context);
-            }
+            this.element.removeEventListener(eventType, this.getEventBinding(eventType));
         }
+        this.onEventHandlers = {};
     }
 
     public removeContextEventHandlers(context: any) {
@@ -801,20 +809,21 @@ export class Tag extends DOMObject {
     }
 
     deconstruct() {
+        const dom = this.dom || DOM.instance;
+        if (dom)
+            dom.deregisterElementInRoot(this);
         this.removeAllEventHandlers();
         this.attributes.forEach(attr => attr.deconstruct());
         this.attributes.clear();
+        this.deferredAttributes.length = 0;
         this._children.forEach(child => child.deconstruct());
         this._children.length = 0;
         if (this._controller) {
             this._controller.deconstruct();
             this._controller = null;
         }
-        if (this.element) {
-            this.element[Tag.TaggedVariable] = null;
-            (this as any).element = null;
-        }
         this._parentTag = null;
+        (this as any).dom = null;
         super.deconstruct();
     }
 }

package/src/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = '0.1.133';
+export const VERSION = '0.1.135';