From 0f40ecfdf1d351762e6b0bc525b3d716756c5643 Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Thu, 20 Jun 2024 00:04:00 +0200
Subject: fixed Escape closing popups when inputs are active

---
 src/app/js/dom_events.js | 6 ------
 src/app/js/gamepad.js    | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/app/js/dom_events.js b/src/app/js/dom_events.js
index ab79c57..490d2ec 100644
--- a/src/app/js/dom_events.js
+++ b/src/app/js/dom_events.js
@@ -26,12 +26,6 @@ document.addEventListener("drop", (e) => {
 	mods.install_from_path(e.dataTransfer.files[0].path);
 })
 
-document.body.addEventListener("keyup", (e) => {
-	if (e.key == "Escape") {
-		popups.hide_last();
-	}
-})
-
 document.body.addEventListener("click", (e) => {
 	if (e.target.tagName.toLowerCase() === "a"
 		&& e.target.protocol != "file:") {
diff --git a/src/app/js/gamepad.js b/src/app/js/gamepad.js
index 134a486..1f65cbe 100644
--- a/src/app/js/gamepad.js
+++ b/src/app/js/gamepad.js
@@ -295,6 +295,9 @@ window.addEventListener("keydown", (e) => {
 		case "Space": return select();
 		case "Enter": return select();
 
+		// close popup
+		case "Escape": return popups.hide_last();
+
 		// move selection
 		case "KeyK": case "ArrowUp": return navigate.move("up")
 		case "KeyJ": case "ArrowDown": return navigate.move("down")
-- 
cgit v1.2.3