Fix issues

yomidevs · Dec 27, 2023 · 433c921 · 433c921
1 parent c5e9f77
commit 433c921
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/ext/js/pages/settings/profile-conditions-ui.js b/ext/js/pages/settings/profile-conditions-ui.js
@@ -861,10 +861,6 @@ class ProfileConditionUI {
         let inputValue = value;
         let inputStep = null;
         let showMouseButton = false;
-        /** @type {import('event-listener-collection').AddEventListenerArgs[]} */
-        const events1 = [];
-        /** @type {import('event-listener-collection').OnArgs[]} */
-        const events2 = [];
         /** @type {import('profile-conditions-ui').InputData} */
         const inputData = {validate, normalize};
         const node = this._valueInput;
@@ -873,18 +869,13 @@ class ProfileConditionUI {
             case 'integer':
                 inputType = 'number';
                 inputStep = '1';
-                events1.push([node, 'change', this._onValueInputChange.bind(this, inputData), false]);
                 break;
             case 'modifierKeys':
             case 'modifierInputs':
                 inputValue = null;
                 showMouseButton = (type === 'modifierInputs');
                 this._kbmInputField = this._parent.parent.createKeyboardMouseInputField(node, this._mouseButton);
                 this._kbmInputField.prepare(null, this._splitModifiers(value), showMouseButton, false);
-                events2.push([this._kbmInputField, 'change', this._onModifierInputChange.bind(this, inputData)]);
-                break;
-            default: // 'string'
-                events1.push([node, 'change', this._onValueInputChange.bind(this, inputData), false]);
                 break;
         }
 
@@ -900,11 +891,17 @@ class ProfileConditionUI {
             node.removeAttribute('step');
         }
         this._mouseButtonContainer.hidden = !showMouseButton;
-        for (const args of events1) {
-            this._inputEventListeners.addEventListener(...args);
-        }
-        for (const args of events2) {
-            this._inputEventListeners.on(...args);
+
+        switch (type) {
+            case 'modifierKeys':
+            case 'modifierInputs':
+                if (this._kbmInputField !== null) {
+                    this._inputEventListeners.on(this._kbmInputField, 'change', this._onModifierInputChange.bind(this, inputData));
+                }
+                break;
+            default: // 'integer', 'string'
+                this._inputEventListeners.addEventListener(node, 'change', this._onValueInputChange.bind(this, inputData), false);
+                break;
         }
 
         return this._validateValue(value, validate);

diff --git a/types/ext/event-listener-collection.d.ts b/types/ext/event-listener-collection.d.ts
@@ -67,9 +67,3 @@ export type AddEventListenerArgs = [
     listener: EventListener | EventListenerObject | EventListenerFunction,
     options?: AddEventListenerOptions | boolean,
 ];
-
-export type OnArgs = [
-    target: Core.EventDispatcherOffGeneric,
-    eventName: string,
-    callback: (details: Core.SafeAny) => void,
-];