From a62ccd20a7c5bf7df2f113d275469fbed21f3d20 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 1 Oct 2021 16:41:05 +0100 Subject: [PATCH] fixed lint warnings --- src/js/input-controller.js | 160 ++++++++++++++++++------------------ src/js/test/caps-warning.js | 2 - 2 files changed, 80 insertions(+), 82 deletions(-) diff --git a/src/js/input-controller.js b/src/js/input-controller.js index 599538ee3..29ad470c7 100644 --- a/src/js/input-controller.js +++ b/src/js/input-controller.js @@ -28,86 +28,6 @@ import * as WeakSpot from "./weak-spot"; let dontInsertSpace = false; let correctShiftUsed = true; -function handleTab(event) { - if (TestUI.resultCalculating) { - event.preventDefault(); - } - if ( - !$("#presetWrapper").hasClass("hidden") || - !$("#tagsWrapper").hasClass("hidden") - ) { - event.preventDefault(); - return; - } - if ($("#customTextPopup .textarea").is(":focus")) { - event.preventDefault(); - - let area = $("#customTextPopup .textarea")[0]; - - var start = area.selectionStart; - var end = area.selectionEnd; - - // set textarea value to: text before caret + tab + text after caret - area.value = - area.value.substring(0, start) + "\t" + area.value.substring(end); - - // put caret at right position again - area.selectionStart = area.selectionEnd = start + 1; - - return; - } else if ( - !TestUI.resultCalculating && - $("#commandLineWrapper").hasClass("hidden") && - $("#simplePopupWrapper").hasClass("hidden") && - !$(".page.pageLogin").hasClass("active") - ) { - if ($(".pageTest").hasClass("active")) { - if (Config.quickTab) { - if ( - TestUI.resultVisible || - !( - (Config.mode == "zen" && !event.shiftKey) || - (TestLogic.hasTab && !event.shiftKey) - ) - ) { - if (event.shiftKey) { - ManualRestart.set(); - } else { - ManualRestart.reset(); - } - event.preventDefault(); - if ( - TestLogic.active && - Config.repeatQuotes === "typing" && - Config.mode === "quote" - ) { - TestLogic.restart(true, false, event); - } else { - TestLogic.restart(false, false, event); - } - } else { - event.preventDefault(); - handleChar("\t", TestLogic.input.current.length); - } - } else if (!TestUI.resultVisible) { - if ( - (TestLogic.hasTab && event.shiftKey) || - (!TestLogic.hasTab && Config.mode !== "zen") || - (Config.mode === "zen" && event.shiftKey) - ) { - event.preventDefault(); - $("#restartTestButton").focus(); - } else { - event.preventDefault(); - handleChar("\t", TestLogic.input.current.length); - } - } - } else if (Config.quickTab) { - UI.changePage("test"); - } - } -} - function backspaceToPrevious() { if (!TestLogic.active) return; @@ -622,6 +542,86 @@ function handleChar(char, charIndex) { $("#wordsInput").val(" " + TestLogic.input.current); } +function handleTab(event) { + if (TestUI.resultCalculating) { + event.preventDefault(); + } + if ( + !$("#presetWrapper").hasClass("hidden") || + !$("#tagsWrapper").hasClass("hidden") + ) { + event.preventDefault(); + return; + } + if ($("#customTextPopup .textarea").is(":focus")) { + event.preventDefault(); + + let area = $("#customTextPopup .textarea")[0]; + + var start = area.selectionStart; + var end = area.selectionEnd; + + // set textarea value to: text before caret + tab + text after caret + area.value = + area.value.substring(0, start) + "\t" + area.value.substring(end); + + // put caret at right position again + area.selectionStart = area.selectionEnd = start + 1; + + return; + } else if ( + !TestUI.resultCalculating && + $("#commandLineWrapper").hasClass("hidden") && + $("#simplePopupWrapper").hasClass("hidden") && + !$(".page.pageLogin").hasClass("active") + ) { + if ($(".pageTest").hasClass("active")) { + if (Config.quickTab) { + if ( + TestUI.resultVisible || + !( + (Config.mode == "zen" && !event.shiftKey) || + (TestLogic.hasTab && !event.shiftKey) + ) + ) { + if (event.shiftKey) { + ManualRestart.set(); + } else { + ManualRestart.reset(); + } + event.preventDefault(); + if ( + TestLogic.active && + Config.repeatQuotes === "typing" && + Config.mode === "quote" + ) { + TestLogic.restart(true, false, event); + } else { + TestLogic.restart(false, false, event); + } + } else { + event.preventDefault(); + handleChar("\t", TestLogic.input.current.length); + } + } else if (!TestUI.resultVisible) { + if ( + (TestLogic.hasTab && event.shiftKey) || + (!TestLogic.hasTab && Config.mode !== "zen") || + (Config.mode === "zen" && event.shiftKey) + ) { + event.preventDefault(); + $("#restartTestButton").focus(); + } else { + event.preventDefault(); + handleChar("\t", TestLogic.input.current.length); + } + } + } else if (Config.quickTab) { + UI.changePage("test"); + } + } +} + $(document).keydown((event) => { //autofocus const wordsFocused = $("#wordsInput").is(":focus"); diff --git a/src/js/test/caps-warning.js b/src/js/test/caps-warning.js index c584362ed..0f3ab25a7 100644 --- a/src/js/test/caps-warning.js +++ b/src/js/test/caps-warning.js @@ -1,5 +1,3 @@ -import Config from "./config"; - function show() { if ($("#capsWarning").hasClass("hidden")) { $("#capsWarning").removeClass("hidden");