added getActiveMenu function

destinygg · Nov 7, 2024 · 3cae812 · 3cae812
1 parent 2617dd7
commit 3cae812
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/assets/chat/js/chat.js b/assets/chat/js/chat.js
@@ -417,9 +417,10 @@ class Chat {
     document.addEventListener('keydown', (e) => {
       if (isKeyCode(e, KEYCODES.ESC)) {
         // If any menus are open, close them first
-        if ([...this.menus].some(([, menu]) => menu.visible)) ChatMenu.closeMenus(this);
+        if (this.getActiveMenu() !== undefined) ChatMenu.closeMenus(this);
         // If the active window is scrolled up (not pinned), scroll to bottom
-        else if (!this.getActiveWindow().scrollplugin.pinned) this.getActiveWindow().scrollplugin.scrollBottom();
+        else if (!this.getActiveWindow().scrollplugin.pinned)
+          this.getActiveWindow().scrollplugin.scrollBottom();
       }
     });
 
@@ -927,6 +928,10 @@ class Chat {
     if (this.mainwindow !== null) this.mainwindow.update();
   }
 
+  getActiveMenu() {
+    return [...this.menus.values()].find((menu) => menu.visible);
+  }
+
   censor(nick) {
     for (const message of this.mainwindow.messages) {
       if (message.user?.username === nick.toLowerCase()) {