From b659a68d9b04bce562cc7601f9af2207b47cec00 Mon Sep 17 00:00:00 2001 From: Miodec Date: Sat, 29 Jul 2023 01:43:51 +0200 Subject: [PATCH] moved variable to a different module --- frontend/src/ts/test/pace-caret.ts | 9 +++++++-- frontend/src/ts/test/test-logic.ts | 2 +- frontend/src/ts/test/test-stats.ts | 6 ------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/frontend/src/ts/test/pace-caret.ts b/frontend/src/ts/test/pace-caret.ts index 810acd00c..865265cf1 100644 --- a/frontend/src/ts/test/pace-caret.ts +++ b/frontend/src/ts/test/pace-caret.ts @@ -1,4 +1,3 @@ -import * as TestStats from "./test-stats"; import * as TestWords from "./test-words"; import * as TestUI from "./test-ui"; import Config from "../config"; @@ -21,6 +20,12 @@ interface Settings { export let settings: Settings | null = null; +let lastTestWpm = 0; + +export function setLastTestWpm(wpm: number): void { + lastTestWpm = wpm; +} + function resetCaretPosition(): void { if (Config.paceCaret === "off" && !TestState.isPaceRepeat) return; if (!$("#paceCaret").hasClass("hidden")) { @@ -87,7 +92,7 @@ export async function init(): Promise { } else if (Config.paceCaret === "custom") { wpm = Config.paceCaretCustomSpeed; } else if (Config.paceCaret === "last" || TestState.isPaceRepeat === true) { - wpm = TestStats.lastTestWpm; + wpm = lastTestWpm; } if (wpm === undefined || wpm < 1 || Number.isNaN(wpm)) { settings = null; diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts index dd1e444e2..201e9d1de 100644 --- a/frontend/src/ts/test/test-logic.ts +++ b/frontend/src/ts/test/test-logic.ts @@ -845,7 +845,7 @@ function buildCompletedEvent(difficultyFailed: boolean): CompletedEvent { if (stats.time % 1 !== 0 && Config.mode !== "time") { TestStats.setLastSecondNotRound(); } - TestStats.setLastTestWpm(stats.wpm); + PaceCaret.setLastTestWpm(stats.wpm); completedEvent.wpm = stats.wpm; completedEvent.rawWpm = stats.wpmRaw; completedEvent.charStats = [ diff --git a/frontend/src/ts/test/test-stats.ts b/frontend/src/ts/test/test-stats.ts index a7605d55b..355e515a7 100644 --- a/frontend/src/ts/test/test-stats.ts +++ b/frontend/src/ts/test/test-stats.ts @@ -35,12 +35,6 @@ export let start: number, end: number; export let start2: number, end2: number; export let lastSecondNotRound = false; -export let lastTestWpm = 0; - -export function setLastTestWpm(wpm: number): void { - lastTestWpm = wpm; -} - export let lastResult: MonkeyTypes.Result; export function setLastResult(