From ec4c65356d03d242ae1b5254a31a420fb44cd68f Mon Sep 17 00:00:00 2001 From: Miodec Date: Thu, 3 Feb 2022 15:54:07 +0100 Subject: [PATCH] inverted logic, using vanilla js --- src/js/input-controller.js | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/js/input-controller.js b/src/js/input-controller.js index 592bc0694..bd8b08e81 100644 --- a/src/js/input-controller.js +++ b/src/js/input-controller.js @@ -660,24 +660,40 @@ $(document).keydown((event) => { //autofocus const wordsFocused = $("#wordsInput").is(":focus"); - const pageTestActive = !$(".pageTest").hasClass("hidden"); + const pageTestActive = UI.getActivePage() === "pageTest"; const commandLineVisible = !$("#commandLineWrapper").hasClass("hidden"); const leaderboardsVisible = !$("#leaderboardsWrapper").hasClass("hidden"); - const modePopupVisible = - !$("#customTextPopupWrapper").hasClass("hidden") || - !$("#customWordAmountPopupWrapper").hasClass("hidden") || - !$("#customTestDurationPopupWrapper").hasClass("hidden") || - !$("#quoteSearchPopupWrapper").hasClass("hidden") || - !$("#quoteSubmitPopupWrapper").hasClass("hidden") || - !$("#quoteApprovePopupWrapper").hasClass("hidden") || - !$("#quoteReportPopupWrapper").hasClass("hidden") || - !$("#wordFilterPopupWrapper").hasClass("hidden"); + const popupsHidden = + document + .querySelector("#customTextPopupWrapper") + ?.classList.contains("hidden") === true || + document + .querySelector("#customWordAmountPopupWrapper") + ?.classList.contains("hidden") === true || + document + .querySelector("#customTestDurationPopupWrapper") + ?.classList.contains("hidden") === true || + document + .querySelector("#quoteSearchPopupWrapper") + ?.classList.contains("hidden") === true || + document + .querySelector("#quoteSubmitPopupWrapper") + ?.classList.contains("hidden") === true || + document + .querySelector("#quoteApprovePopupWrapper") + ?.classList.contains("hidden") === true || + document + .querySelector("#quoteReportPopupWrapper") + ?.classList.contains("hidden") === true || + document + .querySelector("#wordFilterPopupWrapper") + ?.classList.contains("hidden") === true; const allowTyping = pageTestActive && !commandLineVisible && !leaderboardsVisible && - !modePopupVisible && + popupsHidden && !TestUI.resultVisible && (wordsFocused || event.key !== "Enter");