stopw: show millis for the first minute

pull/2697/head
Rob Pilling 2023-04-19 21:50:51 +01:00
parent a467a81c33
commit 05094f6c51
2 changed files with 9 additions and 9 deletions

View File

@ -2,7 +2,7 @@
var durationOnPause = "---";
var redrawInterval;
var startTime;
var over1s = false;
var showMillis = true;
var _a = (require("Storage").readJSON("clkinfostopw.setting.json", true) || {}).format, format = _a === void 0 ? 0 : _a;
var unqueueRedraw = function () {
if (redrawInterval)
@ -14,8 +14,8 @@
unqueueRedraw();
redrawInterval = setInterval(function () {
if (startTime) {
if (!over1s && Date.now() - startTime > 1000) {
over1s = true;
if (showMillis && Date.now() - startTime > 60000) {
showMillis = false;
changeInterval(redrawInterval, 1000);
}
}
@ -36,7 +36,7 @@
seconds %= 60;
if (mins < 60)
return format === 0
? "".concat(pad2(mins), "m").concat(pad2(seconds), "s")
? "".concat(mins.toFixed(0), "m").concat(pad2(seconds), "s")
: "".concat(mins.toFixed(0), ":").concat(pad2(seconds));
var hours = mins / 60;
mins %= 60;
@ -73,7 +73,7 @@
}
else {
queueRedraw.call(this);
over1s = false;
showMillis = true;
startTime = Date.now();
}
}

View File

@ -2,7 +2,7 @@
let durationOnPause = "---";
let redrawInterval: number | undefined;
let startTime: number | undefined;
let over1s = false;
let showMillis = true;
let { format = StopWatchFormat.HMS }: StopWatchSettings
= require("Storage").readJSON("clkinfostopw.setting.json", true) || {};
@ -15,8 +15,8 @@
unqueueRedraw();
redrawInterval = setInterval(() => {
if (startTime) {
if (!over1s && Date.now() - startTime > 1000) {
over1s = true;
if (showMillis && Date.now() - startTime > 60000) {
showMillis = false;
changeInterval(redrawInterval, 1000);
}
} else {
@ -80,7 +80,7 @@
startTime = undefined; // this also unqueues the redraw
} else {
queueRedraw.call(this);
over1s = false;
showMillis = true;
startTime = Date.now();
}
}