From 58ac17fa1e2e928d615b49180575b25fba3c5709 Mon Sep 17 00:00:00 2001 From: Miodec Date: Fri, 11 Feb 2022 16:21:17 +0100 Subject: [PATCH] moved glarses into its own state module fixes 1 circular dependency part of #2462 --- frontend/src/js/index.js | 4 ++-- frontend/src/js/states/glarses-mode.js | 13 +++++++++++++ frontend/src/js/test/result.js | 6 +++--- frontend/src/js/test/test-logic.js | 10 ---------- 4 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 frontend/src/js/states/glarses-mode.js diff --git a/frontend/src/js/index.js b/frontend/src/js/index.js index 0ff56d274..cbf44ef34 100644 --- a/frontend/src/js/index.js +++ b/frontend/src/js/index.js @@ -11,7 +11,7 @@ Chart.plugins.register(chartAnnotation); import * as DB from "./db"; import * as Misc from "./misc"; import Config from "./config"; -import { toggleGlarses } from "./test/test-logic"; +import { enable } from "./states/glarses-mode"; import "./test/caps-warning"; import "./popups/support-popup"; import "./popups/contact-popup"; @@ -37,7 +37,7 @@ global.snapshot = DB.getSnapshot; global.config = Config; // global.addnotif = Notifications.add; -global.glarsesMode = toggleGlarses; +global.glarsesMode = enable; global.stats = TestStats.getStats; diff --git a/frontend/src/js/states/glarses-mode.js b/frontend/src/js/states/glarses-mode.js new file mode 100644 index 000000000..bce29bffc --- /dev/null +++ b/frontend/src/js/states/glarses-mode.js @@ -0,0 +1,13 @@ +let glarsesMode = false; + +export function get() { + return glarsesMode; +} + +export function enable() { + glarsesMode = true; + console.log( + "Glarses Mode On - test result will be hidden. You can check the stats in the console (here)" + ); + console.log("To disable Glarses Mode refresh the page."); +} diff --git a/frontend/src/js/test/result.js b/frontend/src/js/test/result.js index a60d0fbf2..806b2b620 100644 --- a/frontend/src/js/test/result.js +++ b/frontend/src/js/test/result.js @@ -9,7 +9,7 @@ import * as DB from "../db"; import * as TodayTracker from "./today-tracker"; import * as PbCrown from "./pb-crown"; import * as QuoteRatePopup from "../popups/quote-rate-popup"; -import * as TestLogic from "./test-logic"; +import * as GlarsesMode from "./../states/glarses-mode"; import * as TestInput from "./test-input"; import * as Notifications from "../elements/notifications"; @@ -624,7 +624,7 @@ export function update( $("#result .stats .infoAndTags").removeClass("hidden"); } - if (TestLogic.glarsesMode) { + if (GlarsesMode.get()) { $("#middle #result .noStressMessage").remove(); $("#middle #result").prepend(` @@ -690,7 +690,7 @@ export function update( }, 125 ); - if (Config.alwaysShowWordsHistory && !TestLogic.glarsesMode) { + if (Config.alwaysShowWordsHistory && !GlarsesMode.get()) { TestUI.toggleResultWords(); } Keymap.hide(); diff --git a/frontend/src/js/test/test-logic.js b/frontend/src/js/test/test-logic.js index 093883b4e..8d5848415 100644 --- a/frontend/src/js/test/test-logic.js +++ b/frontend/src/js/test/test-logic.js @@ -47,18 +47,8 @@ import * as ModesNotice from "./../elements/modes-notice"; const objecthash = require("node-object-hash")().hash; -export let glarsesMode = false; - let failReason = ""; -export function toggleGlarses() { - glarsesMode = true; - console.log( - "Glarses Mode On - test result will be hidden. You can check the stats in the console (here)" - ); - console.log("To disable Glarses Mode refresh the page."); -} - export let notSignedInLastResult = null; export function clearNotSignedInResult() {