From b89d4fa56eb7e87a41a382927f831ba7f198fad5 Mon Sep 17 00:00:00 2001 From: Miodec Date: Tue, 16 Mar 2021 09:56:35 +0000 Subject: [PATCH] moved caps warning to a module #495 --- gulpfile.js | 1 + src/js/global-dependencies.js | 1 + src/js/script.js | 22 ---------------------- src/js/test/caps-warning.js | 26 ++++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 src/js/test/caps-warning.js diff --git a/gulpfile.js b/gulpfile.js index 79fd601a8..00ddd9d08 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -114,6 +114,7 @@ const refactoredSrc = [ "./src/js/test/test-ui.js", "./src/js/test/keymap.js", "./src/js/test/live-wpm.js", + "./src/js/test/caps-warning.js", ]; //legacy files diff --git a/src/js/global-dependencies.js b/src/js/global-dependencies.js index 4fc5f90ef..bb80dda6a 100644 --- a/src/js/global-dependencies.js +++ b/src/js/global-dependencies.js @@ -43,3 +43,4 @@ import * as PractiseMissed from "./practise-missed"; import * as TestUI from "./test-ui"; import * as Keymap from "./keymap"; import * as LiveWpm from "./live-wpm"; +import * as CapsWarning from "./caps-warning"; diff --git a/src/js/script.js b/src/js/script.js index add9befc0..fc7f4712a 100644 --- a/src/js/script.js +++ b/src/js/script.js @@ -3173,18 +3173,6 @@ function tagsEdit() { } } -function showCapsWarning() { - if ($("#capsWarning").hasClass("hidden")) { - $("#capsWarning").removeClass("hidden"); - } -} - -function hideCapsWarning() { - if (!$("#capsWarning").hasClass("hidden")) { - $("#capsWarning").addClass("hidden"); - } -} - function showCustomMode2Popup(mode) { if ($("#customMode2PopupWrapper").hasClass("hidden")) { if (mode == "time") { @@ -3997,16 +3985,6 @@ $(document).keydown(function (event) { // keypressStats.duration.current = performance.now(); TestStats.setKeypressDuration(performance.now()); - try { - if ( - !Config.capsLockBackspace && - event.originalEvent.getModifierState("CapsLock") - ) { - showCapsWarning(); - } else { - hideCapsWarning(); - } - } catch {} if (TestUI.testRestarting) { return; diff --git a/src/js/test/caps-warning.js b/src/js/test/caps-warning.js new file mode 100644 index 000000000..39e097570 --- /dev/null +++ b/src/js/test/caps-warning.js @@ -0,0 +1,26 @@ +import Config from "./config"; + +function show() { + if ($("#capsWarning").hasClass("hidden")) { + $("#capsWarning").removeClass("hidden"); + } +} + +function hide() { + if (!$("#capsWarning").hasClass("hidden")) { + $("#capsWarning").addClass("hidden"); + } +} + +$(document).keydown(function (event) { + try { + if ( + !Config.capsLockBackspace && + event.originalEvent.getModifierState("CapsLock") + ) { + show(); + } else { + hide(); + } + } catch {} +});