From b4b1fb8d9ae073c380aa2ce4d8fb77c985272b03 Mon Sep 17 00:00:00 2001
From: Maxim Devaev <mdevaev@gmail.com>
Date: Thu, 19 Jun 2025 08:27:56 +0300
Subject: [PATCH] web: improved kb handling in modals

---
 web/share/js/wm.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/web/share/js/wm.js b/web/share/js/wm.js
index 25631c85..d07e9710 100644
--- a/web/share/js/wm.js
+++ b/web/share/js/wm.js
@@ -297,13 +297,22 @@ function __WindowManager() {
 		let el_ok_bt = el_win.querySelector(".modal-button-ok");
 		let el_cancel_bt = el_win.querySelector(".modal-button-cancel");
 
+		let key_pressed = "";
+		el_win.addEventListener("keydown", function (ev) {
+			ev.preventDefault();
+			key_pressed = ev.code;
+		});
+
 		el_win.addEventListener("keyup", function (ev) {
 			ev.preventDefault();
-			if (ok && ev.code === "Enter") {
-				el_ok_bt.click();
-			} else if (cancel && ev.code === "Escape") {
-				el_cancel_bt.click();
+			if (ev.code === key_pressed) {
+				if (ok && ev.code === "Enter") {
+					el_ok_bt.click();
+				} else if (cancel && ev.code === "Escape") {
+					el_cancel_bt.click();
+				}
 			}
+			key_pressed = "";
 		});
 
 		let promise = null;