From b963b48df52ff6bc9d352d0d84d133909147bff5 Mon Sep 17 00:00:00 2001
From: tobspr <>
Date: Mon, 1 Jun 2020 13:02:43 +0200
Subject: [PATCH] Fix keybindings not being properly assigned

---
 src/js/states/keybindings.js | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/js/states/keybindings.js b/src/js/states/keybindings.js
index f9b25359..bc2b4a18 100644
--- a/src/js/states/keybindings.js
+++ b/src/js/states/keybindings.js
@@ -105,6 +105,10 @@ export class KeybindingsState extends TextualGameState {
                 event.preventDefault();
             }
 
+            if (event.target && event.target.tagName === "BUTTON" && keyCode === 1) {
+                return;
+            }
+
             if (
                 // Enter
                 keyCode === 13 ||
@@ -121,22 +125,8 @@ export class KeybindingsState extends TextualGameState {
             this.updateKeybindings();
         });
 
-        const clickListener = event => {
-            if (event.target.tagName == "BUTTON") {
-                return;
-            }
-            event.preventDefault();
-            const keyCode = event.button + 1;
-
-            this.app.settings.updateKeybindingOverride(id, keyCode);
-
-            this.dialogs.closeDialog(dialog);
-            this.updateKeybindings();
-        };
-
         dialog.inputReciever.backButton.add(() => {});
         this.dialogs.internalShowDialog(dialog);
-        dialog.element.addEventListener("mousedown", clickListener);
 
         this.app.sound.playUiSound(SOUNDS.dialogOk);
     }