monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2026-01-06 15:34:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

resolving conflict

Browse source
This commit is contained in:
willerbee 2020-10-14 08:43:17 +08:00 • committed by GitHub
parent a83b758c1a
commit 9c222408c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/js/commandline.js
View file

@ -1431,7 +1431,11 @@ $(document).ready((e) => {
//escape
if ((event.keyCode == 27 && !config.swapEscAndTab) || (event["keyCode"] == 9 && config.swapEscAndTab)) {
event.preventDefault();
if ($("#commandLineWrapper").hasClass("hidden")) {
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