fix #295, #298: timer bugs

qbreader · Jul 5, 2024 · bcdf837 · bcdf837
1 parent 00171fb
commit bcdf837
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/client/scripts/Timer.js b/client/scripts/Timer.js
@@ -11,7 +11,7 @@ export default class Timer {
     return this.tenthsRemaining % 10;
   }
 
-  pauseTimer () {
+  stopTimer () {
     clearInterval(this.timerInterval);
   }
 

diff --git a/client/singleplayer/tossups.js b/client/singleplayer/tossups.js
@@ -259,6 +259,7 @@ function buzz () {
   document.getElementById('pause').disabled = true;
 
   if (settings.timer) {
+    timer.stopTimer();
     timer.startTimer(ANSWER_TIME_LIMIT, () => document.getElementById('answer-submit').click());
   }
 }
@@ -352,6 +353,11 @@ async function next () {
   // Stop reading the current question:
   clearTimeout(timeoutID);
   currentlyBuzzing = false;
+  if (settings.timer) {
+    timer.stopTimer();
+    timer.tenthsRemaining = 0;
+    timer.updateDisplay();
+  }
 
   if (await account.getUsername() && document.getElementById('answer').innerHTML) {
     const pointValue = previous.isCorrect ? (previous.inPower ? previous.powerValue : 10) : (previous.endOfQuestion ? 0 : previous.negValue);
@@ -555,6 +561,12 @@ document.getElementById('answer-form').addEventListener('submit', function (even
   event.preventDefault();
   event.stopPropagation();
 
+  if (settings.timer) {
+    timer.stopTimer();
+    timer.tenthsRemaining = 0;
+    timer.updateDisplay();
+  }
+
   const answer = document.getElementById('answer-input').value;
 
   document.getElementById('answer-input').value = '';