From d09070d310f1964d32387d93b3dcff09b8061aac Mon Sep 17 00:00:00 2001
From: "Stiliyan Tonev (Bark)" <stiliyan21@gmail.com>
Date: Sat, 28 Jun 2025 14:08:35 +0300
Subject: [PATCH] WebUI: Coding style fixes

---
 src/webui/www/private/confirmfeeddeletion.html    | 1 +
 src/webui/www/private/confirmruleclear.html       | 1 +
 src/webui/www/private/confirmruledeletion.html    | 1 +
 src/webui/www/private/confirmtrackerdeletion.html | 1 +
 src/webui/www/private/download.html               | 1 +
 src/webui/www/private/scripts/client.js           | 8 +++++---
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/webui/www/private/confirmfeeddeletion.html b/src/webui/www/private/confirmfeeddeletion.html
index 93d82a758..e802e3f70 100644
--- a/src/webui/www/private/confirmfeeddeletion.html
+++ b/src/webui/www/private/confirmfeeddeletion.html
@@ -19,6 +19,7 @@
                         break;
                 }
             });
+
             document.getElementById("cancelBtn").focus();
             document.getElementById("cancelBtn").addEventListener("click", (e) => {
                 e.preventDefault();
diff --git a/src/webui/www/private/confirmruleclear.html b/src/webui/www/private/confirmruleclear.html
index f98de30a9..8b6f7889b 100644
--- a/src/webui/www/private/confirmruleclear.html
+++ b/src/webui/www/private/confirmruleclear.html
@@ -19,6 +19,7 @@
                         break;
                 }
             });
+
             document.getElementById("cancelBtn").focus();
             document.getElementById("cancelBtn").addEventListener("click", (e) => {
                 e.preventDefault();
diff --git a/src/webui/www/private/confirmruledeletion.html b/src/webui/www/private/confirmruledeletion.html
index bd6ab45f7..db0a1c175 100644
--- a/src/webui/www/private/confirmruledeletion.html
+++ b/src/webui/www/private/confirmruledeletion.html
@@ -19,6 +19,7 @@
                         break;
                 }
             });
+
             document.getElementById("cancelBtn").focus();
             document.getElementById("cancelBtn").addEventListener("click", (e) => {
                 e.preventDefault();
diff --git a/src/webui/www/private/confirmtrackerdeletion.html b/src/webui/www/private/confirmtrackerdeletion.html
index 16cccbbbb..c3d1f0a49 100644
--- a/src/webui/www/private/confirmtrackerdeletion.html
+++ b/src/webui/www/private/confirmtrackerdeletion.html
@@ -19,6 +19,7 @@
                         break;
                 }
             });
+
             const searchParams = new URLSearchParams(window.location.search);
             const host = searchParams.get("host");
 
diff --git a/src/webui/www/private/download.html b/src/webui/www/private/download.html
index ca9bf5065..807e95f70 100644
--- a/src/webui/www/private/download.html
+++ b/src/webui/www/private/download.html
@@ -22,6 +22,7 @@
                         break;
                 }
             });
+
             const encodedUrls = new URLSearchParams(window.location.search).get("urls");
             if (encodedUrls !== null) {
                 const urls = encodedUrls.split("|").map(decodeURIComponent);
diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
index 24f53a794..0877680b0 100644
--- a/src/webui/www/private/scripts/client.js
+++ b/src/webui/www/private/scripts/client.js
@@ -1777,17 +1777,18 @@ window.addEventListener("DOMContentLoaded", (event) => {
             case "Escape": {
                 if (event.target.isContentEditable)
                     return;
+
                 event.preventDefault();
                 const modalInstances = Object.values(MochaUI.Windows.instances);
                 if (modalInstances.length <= 0)
                     return;
+
                 // MochaUI.currentModal does not update after a modal is closed
                 const focusedModal = modalInstances.find((modal) => {
                     return modal.windowEl.hasClass("isFocused");
                 });
-                if (!focusedModal)
-                    return;
-                focusedModal.close();
+                if (focusedModal !== undefined)
+                    focusedModal.close();
                 break;
             }
 
@@ -1815,6 +1816,7 @@ window.addEventListener("DOMContentLoaded", (event) => {
                         torrentsFilterElem.focus();
                     }
                 }
+                break;
         }
     });