Deferred event listener addition.

Until after elements are attached, so that removeChild followed by appendChild doesn't leave the element with no listeners. Fixes #230.
loot · Aug 23, 2014 · 4051894 · 4051894
1 parent 6b518a4
commit 4051894
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/resources/report/js/custom.js b/resources/report/js/custom.js
@@ -86,9 +86,11 @@ var pluginMenuProto = Object.create(HTMLElement.prototype, {
             var clone = document.importNode(template.content, true);
 
             this.createShadowRoot().appendChild(clone);
+        }
+    },
 
-            this.id = 'activePluginMenu';
-
+    attachedCallback: {
+        value: function() {
             /* Add event listeners for the menu items. */
             this.shadowRoot.getElementById('editMetadata').addEventListener('click', this.onMenuItemClick, false);
             this.shadowRoot.getElementById('copyMetadata').addEventListener('click', this.onMenuItemClick, false);
@@ -545,17 +547,19 @@ var pluginCardProto = Object.create(HTMLElement.prototype, {
 
             var messages = document.createElement('ul');
             this.appendChild(messages);
+        }
+    },
 
+    attachedCallback: {
+        value: function() {
             this.shadowRoot.getElementById('menuButton').addEventListener('click', this.onMenuButtonClick, false);
 
             var hoverTargets = this.shadowRoot.querySelectorAll('[title]');
             for (var i = 0; i < hoverTargets.length; ++i) {
                 hoverTargets[i].addEventListener('mouseenter', showHoverText, false);
                 hoverTargets[i].addEventListener('mouseleave', hideHoverText, false);
             }
-
         }
-
     },
 
     detachedCallback: {
@@ -591,15 +595,17 @@ var pluginLIProto = Object.create(HTMLLIElement.prototype, {
             var priority = document.createElement('span');
             priority.className = 'priority';
             this.appendChild(priority);
+        }
+    },
 
+    attachedCallback: {
+        value: function() {
             var hoverTargets = this.shadowRoot.querySelectorAll('[title]');
             for (var i = 0; i < hoverTargets.length; ++i) {
                 hoverTargets[i].addEventListener('mouseenter', showHoverText, false);
                 hoverTargets[i].addEventListener('mouseleave', hideHoverText, false);
             }
-
         }
-
     },
 
     detachedCallback: {
@@ -692,7 +698,11 @@ var messageDialogProto = Object.create(HTMLDialogElement.prototype, {
             cancel.className = 'cancel';
             cancel.textContent = 'Cancel';
             buttons.appendChild(cancel);
+        }
+    },
 
+    attachedCallback: {
+        value: function() {
             this.addEventListener('close', this.onClose, false);
         }
     },
@@ -849,13 +859,11 @@ var EditableTableProto = Object.create(HTMLTableElement.prototype, {
         }
     },
 
-    createdCallback: {
-
+    attachedCallback: {
         value: function() {
             /* Add new row listener. */
             this.querySelector('tbody tr:last-child').addEventListener('click', this.addEmptyRow, false);
         }
-
     },
 
     detachedCallback: {

diff --git a/resources/report/js/script.js b/resources/report/js/script.js
@@ -660,12 +660,6 @@ function updateSettingsUI() {
         var li = document.createElement('li');
         li.setAttribute('data-folder', loot.settings.games[i].folder);
 
-        if (loot.installedGames.indexOf(loot.settings.games[i].folder) == -1) {
-            li.classList.toggle('disabled', true);
-        } else {
-            li.addEventListener('click', changeGame, false);
-        }
-
         var icon = document.createElement('span');
         icon.className = 'fa fa-fw';
         li.appendChild(icon);
@@ -676,6 +670,12 @@ function updateSettingsUI() {
 
         gameMenu.appendChild(li);
 
+        if (loot.installedGames.indexOf(loot.settings.games[i].folder) == -1) {
+            li.classList.toggle('disabled', true);
+        } else {
+            li.addEventListener('click', changeGame, false);
+        }
+
         var row = gameTable.addRow(loot.settings.games[i]);
         gameTable.setReadOnly(row, ['name','folder','type']);
     }