From 139337fb5a1b6fcaf04df16b080a471f7be5be49 Mon Sep 17 00:00:00 2001
From: SeerLite <seerlite@tuta.io>
Date: Thu, 7 Jan 2021 17:42:46 -0300
Subject: [PATCH] Revert "Have Escape always close command line/leaderboard"

This reverts commit cd2761029ec140fe3d0e533b0371accb62f7ae35.
---
 src/js/commandline.js | 10 +++++-----
 src/js/script.js      |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/js/commandline.js b/src/js/commandline.js
index ac5ea8d20..f748c8a4f 100644
--- a/src/js/commandline.js
+++ b/src/js/commandline.js
@@ -1770,17 +1770,17 @@ $("#commandLine input").keyup((e) => {
 $(document).ready((e) => {
   $(document).keydown((event) => {
     //escape
-    if (event.keyCode == 27 || (event.keyCode == 9 && config.swapEscAndTab)) {
+    if (
+      (event.keyCode == 27 && !config.swapEscAndTab) ||
+      (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") &&
-        (event.keyCode == 9 || !config.swapEscAndTab)
-      ) {
+      } else if ($("#commandLineWrapper").hasClass("hidden")) {
         if (config.singleListCommandLine == "on")
           useSingleListCommandLine(false);
         else currentCommands = [commands];
diff --git a/src/js/script.js b/src/js/script.js
index ebe5cf1a3..d9ee81129 100644
--- a/src/js/script.js
+++ b/src/js/script.js
@@ -4600,8 +4600,7 @@ function handleTab(event) {
     !$(".pageLogin").hasClass("active") &&
     !resultCalculating &&
     $("#commandLineWrapper").hasClass("hidden") &&
-    $("#simplePopupWrapper").hasClass("hidden") &&
-    $("#leaderboardsWrapper").hasClass("hidden")
+    $("#simplePopupWrapper").hasClass("hidden")
   ) {
     event.preventDefault();
     if ($(".pageTest").hasClass("active")) {