From fea6804808bf3a1e8a75010ed820b59c695c7d62 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 16 Sep 2020 17:29:21 +0100 Subject: [PATCH] reformatted --- public/css/style.scss | 49 +++++++++--------- public/js/script.js | 117 +++++++++++++++++++++++++----------------- 2 files changed, 94 insertions(+), 72 deletions(-) diff --git a/public/css/style.scss b/public/css/style.scss index b76408731..026d922c7 100644 --- a/public/css/style.scss +++ b/public/css/style.scss @@ -1237,21 +1237,21 @@ key { // // margin-top: 0.98rem; // margin-top: -0.5rem; - .crown { - height: 1.7rem; - width: 1.7rem; - margin-left: 0.5rem; - margin-top: -0.2rem; - font-size: 0.7rem; - line-height: 1.7rem; - background: var(--main-color); - color: var(--bg-color); - border-radius: 0.6rem; - text-align: center; - align-self: center; - width: 1.7rem; - height: 1.7rem; - } + .crown { + height: 1.7rem; + width: 1.7rem; + margin-left: 0.5rem; + margin-top: -0.2rem; + font-size: 0.7rem; + line-height: 1.7rem; + background: var(--main-color); + color: var(--bg-color); + border-radius: 0.6rem; + text-align: center; + align-self: center; + width: 1.7rem; + height: 1.7rem; + } // } } @@ -1260,7 +1260,7 @@ key { line-height: 4rem; } } - + .testType, .leaderboards { .bottom { @@ -1348,7 +1348,7 @@ key { flex-direction: row-reverse; } } - &.blurred{ + &.blurred { opacity: 0.25; filter: blur(4px); -webkit-filter: blur(4px); @@ -1465,8 +1465,7 @@ key { #middle { .pageTest { - - .outOfFocusWarning{ + .outOfFocusWarning { text-align: center; height: 0; line-height: 150px; @@ -2144,11 +2143,11 @@ key { gap: 2rem; } - .topFilters .buttons{ + .topFilters .buttons { display: flex; justify-content: space-evenly; gap: 1rem; - .button{ + .button { width: 100%; } } @@ -2192,12 +2191,12 @@ key { justify-self: center; } - .doublegroup{ + .doublegroup { display: grid; grid-auto-flow: column; gap: 1rem; - .titleAndTable{ - .title{ + .titleAndTable { + .title { color: var(--sub-color); } } @@ -2287,7 +2286,7 @@ key { margin-top: 0.5rem; } - .toggleAccuracyOnChart{ + .toggleAccuracyOnChart { position: absolute; right: 0; margin-top: -1.5rem; diff --git a/public/js/script.js b/public/js/script.js index 35c075816..6bfc5c793 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -389,7 +389,7 @@ function initWords() { hideBackgroundLoader(); words["english_10k"] = { leftToRight: true, - words: data + words: data, }; language = words[config.language]; }, @@ -553,8 +553,7 @@ function emulateLayout(event) { event.key = newKey; event.code = "Key" + newKey.toUpperCase(); } - if (event.key === " " || event.key === "Enter") - return event; + if (event.key === " " || event.key === "Enter") return event; if (config.layout === "default") { //override the caps lock modifier for the default layout if needed if (config.capsLockBackspace && isASCIILetter(event.key)) { @@ -702,13 +701,14 @@ function addWord() { wordsList.length >= customText.length)) ) return; - const language = config.mode !== "custom" - ? words[config.language] - : { - //borrow the direction of the current language - leftToRight: words[config.language].leftToRight, - words: customText - }; + const language = + config.mode !== "custom" + ? words[config.language] + : { + //borrow the direction of the current language + leftToRight: words[config.language].leftToRight, + words: customText, + }; const wordset = language.words; let randomWord = wordset[Math.floor(Math.random() * wordset.length)]; previousWord = wordsList[wordsList.length - 1]; @@ -794,7 +794,7 @@ function showWords() { if (nh > wordsHeight) { nh = wordsHeight; } - $(".outOfFocusWarning").css("line-height", nh+"px"); + $(".outOfFocusWarning").css("line-height", nh + "px"); } else { $("#words") .css("height", wordHeight * 4 + "px") @@ -884,7 +884,7 @@ function compareInput(showError) { correctedHistory.push(currentCorrected); document .querySelector("#words .word.active") - .setAttribute("input", currentInput.replace(/'/g, "\'")); + .setAttribute("input", currentInput.replace(/'/g, "'")); showResult(true); } let testNow = Date.now(); @@ -1101,7 +1101,7 @@ function updateTimer() { // } // } let displayTime = secondsToString(config.time - time); - $("#timerNumber").html("
"+displayTime+"
"); + $("#timerNumber").html("
" + displayTime + "
"); // $("#timerNumber").html(config.time - time); } else if (config.timerStyle === "mini") { let displayTime = secondsToString(config.time - time); @@ -1145,7 +1145,9 @@ function updateTimer() { outof = customText.length; } } - $("#timerNumber").html("
"+`${inputHistory.length}/${outof}`+"
"); + $("#timerNumber").html( + "
" + `${inputHistory.length}/${outof}` + "
" + ); // $("#timerNumber").html(config.time - time); } else if (config.timerStyle === "mini") { let outof = wordsList.length; @@ -1556,17 +1558,20 @@ function calculateStats() { } function hideCrown() { - $("#result .stats .wpm .crown").css("opacity", 0).addClass('hidden'); + $("#result .stats .wpm .crown").css("opacity", 0).addClass("hidden"); } function showCrown() { - $("#result .stats .wpm .crown").removeClass('hidden').css('opacity','0').animate( - { - opacity: 1, - }, - 250, - "easeOutCubic" - ); + $("#result .stats .wpm .crown") + .removeClass("hidden") + .css("opacity", "0") + .animate( + { + opacity: 1, + }, + 250, + "easeOutCubic" + ); } function showResult(difficultyFailed = false) { @@ -1631,7 +1636,7 @@ function showResult(difficultyFailed = false) { $("#result .stats .key .bottom").text(testtime + "s"); $("#result .stats .key .bottom").attr("aria-label", `${correctcharpercent}%`); $("#words").removeClass("blurred"); - $(".outOfFocusWarning").addClass('hidden'); + $(".outOfFocusWarning").addClass("hidden"); $("#result .stats .key .bottom").text( stats.correctChars + stats.correctSpaces + "/" + stats.incorrectChars ); @@ -1868,7 +1873,7 @@ function showResult(difficultyFailed = false) { config.difficulty ).then((highestwpm) => { hideCrown(); - $("#result .stats .wpm .crown").attr('aria-label', ''); + $("#result .stats .wpm .crown").attr("aria-label", ""); if (lpb < stats.wpm && stats.wpm < highestwpm) { dontShowCrown = true; } @@ -1878,7 +1883,10 @@ function showResult(difficultyFailed = false) { if (!dontShowCrown) { hideCrown(); showCrown(); - $("#result .stats .wpm .crown").attr('aria-label', '+' + roundTo2(pbDiff)); + $("#result .stats .wpm .crown").attr( + "aria-label", + "+" + roundTo2(pbDiff) + ); } localPb = true; } @@ -2780,7 +2788,9 @@ function liveWpmAndRaw() { let testNow = Date.now(); let testSeconds = (testNow - testStart) / 1000; let wpm = Math.round(((correctWordChars + spaces) * (60 / testSeconds)) / 5); - let raw = Math.round(((chars + spaces + currentInput.length) * (60 / testSeconds)) / 5); + let raw = Math.round( + ((chars + spaces + currentInput.length) * (60 / testSeconds)) / 5 + ); return { wpm: wpm, raw: raw, @@ -2973,12 +2983,18 @@ async function loadWordsHistory() { try { if (input === "") throw Exception; if (correctedHistory[i] !== "") { - wordEl = `
`; + wordEl = `
`; } else { wordEl = `
`; } if (input !== wordsList[i]) { - wordEl = `
`; + wordEl = `
`; } let loop; @@ -3014,7 +3030,8 @@ async function loadWordsHistory() { } } else { if (input[c] === currentInput) { - wordEl += "" + wordsList[i][c] + ""; + wordEl += + "" + wordsList[i][c] + ""; } else if (input[c] === undefined) { wordEl += "" + wordsList[i][c] + ""; } else { @@ -3030,16 +3047,16 @@ async function loadWordsHistory() { } wordEl += "
"; } catch (e) { - try{ + try { wordEl = "
"; for (let c = 0; c < wordsList[i].length; c++) { wordEl += "" + wordsList[i][c] + ""; } - wordEl += "
" - }catch(e){} + wordEl += "
"; + } catch (e) {} } $("#words").append(wordEl); - }; + } $("#showWordHistoryButton").addClass("loaded"); } @@ -3607,7 +3624,7 @@ $(document).on("click", "#top .config .numbersMode .text-button", (e) => { restartTest(); }); -$("#wordsWrapper").on("click",(e) => { +$("#wordsWrapper").on("click", (e) => { focusWords(); }); @@ -3726,16 +3743,16 @@ $("#wordsInput").keypress((event) => { let outOfFocusTimeouts = []; function clearTimeouts(timeouts) { - timeouts.forEach(to => { + timeouts.forEach((to) => { clearTimeout(to); to = null; - }) + }); } $("#wordsInput").on("focus", (event) => { if (!resultVisible && config.showOutOfFocusWarning) { - $("#words").css("transition","none").removeClass("blurred"); - $(".outOfFocusWarning").addClass('hidden'); + $("#words").css("transition", "none").removeClass("blurred"); + $(".outOfFocusWarning").addClass("hidden"); clearTimeouts(outOfFocusTimeouts); } showCaret(); @@ -3743,10 +3760,12 @@ $("#wordsInput").on("focus", (event) => { $("#wordsInput").on("focusout", (event) => { if (!resultVisible && config.showOutOfFocusWarning) { - outOfFocusTimeouts.push(setTimeout(() => { - $("#words").css("transition", "0.25s").addClass('blurred'); - $(".outOfFocusWarning").removeClass('hidden'); - }, 1000)); + outOfFocusTimeouts.push( + setTimeout(() => { + $("#words").css("transition", "0.25s").addClass("blurred"); + $(".outOfFocusWarning").removeClass("hidden"); + }, 1000) + ); } hideCaret(); }); @@ -3855,12 +3874,13 @@ $(document).keypress(function (event) { } } - if(currentInput.length < wordsList[currentWordIndex].length + 20) currentInput += event["key"]; + if (currentInput.length < wordsList[currentWordIndex].length + 20) + currentInput += event["key"]; setFocus(true); stopCaretAnimation(); activeWordTopBeforeJump = activeWordTop; compareInput(!config.blindMode); - + // let newActiveTop = $("#words .word.active").position().top; // console.time("offcheck1"); @@ -3905,7 +3925,7 @@ $(document).keyup((event) => { keypressStats.duration.current = now; }); -window.addEventListener('beforeunload', (event) => { +window.addEventListener("beforeunload", (event) => { // Cancel the event as stated by the standard. if ( (config.mode === "words" && config.words < 1000) || @@ -3922,7 +3942,7 @@ window.addEventListener('beforeunload', (event) => { if (testActive) { event.preventDefault(); // Chrome requires returnValue to be set. - event.returnValue = ''; + event.returnValue = ""; } } }); @@ -3937,7 +3957,10 @@ $(document).keydown((event) => { keypressStats.spacing.current = now; //tab - if ((event["keyCode"] == 9 && !config.swapEscAndTab) || (event["keyCode"] == 27 && config.swapEscAndTab)) { + if ( + (event["keyCode"] == 9 && !config.swapEscAndTab) || + (event["keyCode"] == 27 && config.swapEscAndTab) + ) { if ( !event.ctrlKey && config.quickTab &&