From 1b2e50f8d6090e95598cfbb8f46158ce9a175de4 Mon Sep 17 00:00:00 2001
From: SeerLite <seerlite@tuta.io>
Date: Thu, 7 Jan 2021 18:01:31 -0300
Subject: [PATCH] Have Esc always close commandline/leaderboards

---
 src/js/commandline.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/js/commandline.js b/src/js/commandline.js
index f748c8a4f..bc65e6e8a 100644
--- a/src/js/commandline.js
+++ b/src/js/commandline.js
@@ -1770,22 +1770,13 @@ $("#commandLine input").keyup((e) => {
 $(document).ready((e) => {
   $(document).keydown((event) => {
     //escape
-    if (
-      (event.keyCode == 27 && !config.swapEscAndTab) ||
-      (event["keyCode"] == 9 && config.swapEscAndTab)
-    ) {
+    if (event.keyCode == 27 || (event.keyCode == 9 && config.swapEscAndTab)) {
       event.preventDefault();
       if (!$("#leaderboardsWrapper").hasClass("hidden")) {
         //maybe add more condition for closing other dialogs in the future as well
         event.preventDefault();
         hideLeaderboards();
-        return;
-      } else if ($("#commandLineWrapper").hasClass("hidden")) {
-        if (config.singleListCommandLine == "on")
-          useSingleListCommandLine(false);
-        else currentCommands = [commands];
-        showCommandLine();
-      } else {
+      } else if (!$("#commandLineWrapper").hasClass("hidden")) {
         if (currentCommands.length > 1) {
           currentCommands.pop();
           $("#commandLine").removeClass("allCommands");
@@ -1799,6 +1790,11 @@ $(document).ready((e) => {
         } else {
           setTheme(config.theme);
         }
+      } else if (event.keyCode == 9 || !config.swapEscAndTab) {
+        if (config.singleListCommandLine == "on")
+          useSingleListCommandLine(false);
+        else currentCommands = [commands];
+        showCommandLine();
       }
     }
   });