fix: remove array type event listeners

reallygoodsoftware · Feb 10, 2024 · 2bca46d · 2bca46d
1 parent 78a3925
commit 2bca46d
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/lib/entity.js b/lib/entity.js
@@ -330,6 +330,8 @@ export default class Entity {
   }
 
   applyEventBindings() {
+    this.removeEventBindings()
+
     const el = this.element
 
     // Change binding
@@ -445,8 +447,16 @@ export default class Entity {
 
   removeEventBindings() {
     Object.keys(this.listener).forEach((key) => {
-      const { el, eventName, event } = this.listener[key]
-      el.removeEventListener(eventName, event)
+      const listener = this.listener[key]
+
+      if (Array.isArray(listener)) {
+        listener.forEach(({ el, eventName, event }) => {
+          el.removeEventListener(eventName, event)
+        })
+      } else {
+        const { el, eventName, event } = listener
+        el.removeEventListener(eventName, event)
+      }
     })
   }
 
@@ -489,7 +499,7 @@ export default class Entity {
     unusedVariables.forEach((variable) => {
       if (variable.startsWith('el.')) {
         const varName = variable.replace('el.', '')
-        delete window[this.uuid][varName]
+        if (window[this.uuid]?.[varName]) delete window[this.uuid]
       } else {
         delete window[variable]
       }