From 4bafe9e787f0ccfe5d4ff8b231ce445349c530d8 Mon Sep 17 00:00:00 2001
From: Miodec <bartnikjack@gmail.com>
Date: Tue, 16 Mar 2021 09:03:22 +0000
Subject: [PATCH] moved result calculating into test ui

---
 src/js/script.js       | 13 ++++++-------
 src/js/test/test-ui.js |  5 +++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/js/script.js b/src/js/script.js
index 8b9ac1b4f..9c8a3dcf8 100644
--- a/src/js/script.js
+++ b/src/js/script.js
@@ -1245,7 +1245,6 @@ function failTest() {
   TestStats.incrementRestartCount();
 }
 
-let resultCalculating = false;
 function showResult(difficultyFailed = false) {
   if (!testActive) return;
   if (Config.mode == "zen" && currentInput.length != 0) {
@@ -1255,7 +1254,7 @@ function showResult(difficultyFailed = false) {
 
   TestStats.recordKeypressSpacing();
 
-  resultCalculating = true;
+  TestUI.setResultCalculating(true);
   TestUI.setResultVisible(true);
   TestStats.setEnd(performance.now());
   testActive = false;
@@ -2221,7 +2220,7 @@ function showResult(difficultyFailed = false) {
   ChartController.result.update({ duration: 0 });
   ChartController.result.resize();
   swapElements($("#typingTest"), $("#result"), 250, () => {
-    resultCalculating = false;
+    TestUI.setResultCalculating(false);
     $("#words").empty();
     ChartController.result.resize();
     if (Config.alwaysShowWordsHistory) {
@@ -2393,7 +2392,7 @@ function restartTest(withSameWordset = false, nosave = false, event) {
   //   }
   // }
 
-  if (TestUI.testRestarting || resultCalculating) {
+  if (TestUI.testRestarting || TestUI.resultCalculating) {
     try {
       event.preventDefault();
     } catch {}
@@ -3867,7 +3866,7 @@ $(document).on("keypress", "#restartTestButton", (event) => {
 
 $(document.body).on("click", "#restartTestButton", () => {
   ManualRestart.set();
-  if (resultCalculating) return;
+  if (TestUI.resultCalculating) return;
   if (
     testActive &&
     Config.repeatQuotes === "typing" &&
@@ -4147,7 +4146,7 @@ $(document).keydown(function (event) {
 });
 
 function handleTab(event) {
-  if (resultCalculating) {
+  if (TestUI.resultCalculating) {
     event.preventDefault();
   }
   if ($("#customTextPopup .textarea").is(":focus")) {
@@ -4172,7 +4171,7 @@ function handleTab(event) {
     return;
   } else if (
     $(".pageTest").hasClass("active") &&
-    !resultCalculating &&
+    !TestUI.resultCalculating &&
     $("#commandLineWrapper").hasClass("hidden") &&
     $("#simplePopupWrapper").hasClass("hidden")
   ) {
diff --git a/src/js/test/test-ui.js b/src/js/test/test-ui.js
index 1f3d2a4cd..b0c0ce1e1 100644
--- a/src/js/test/test-ui.js
+++ b/src/js/test/test-ui.js
@@ -9,6 +9,7 @@ export let activeWordTop = 0;
 export let testRestarting = false;
 export let lineTransition = false;
 export let currentTestLine = 0;
+export let resultCalculating = false;
 
 export function setResultVisible(val) {
   resultVisible = val;
@@ -26,6 +27,10 @@ export function setTestRestarting(val) {
   testRestarting = val;
 }
 
+export function setResultCalculating(val) {
+  resultCalculating = val;
+}
+
 export function reset() {
   currentTestLine = 0;
   currentWordElementIndex = 0;