From 05094f6c511991dc41755184166c8361bd666fd5 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Wed, 19 Apr 2023 21:50:51 +0100 Subject: [PATCH] stopw: show millis for the first minute --- apps/clkinfostopw/clkinfo.js | 10 +++++----- apps/clkinfostopw/clkinfo.ts | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/clkinfostopw/clkinfo.js b/apps/clkinfostopw/clkinfo.js index 6fca381e2..43cd8d52f 100644 --- a/apps/clkinfostopw/clkinfo.js +++ b/apps/clkinfostopw/clkinfo.js @@ -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(); } } diff --git a/apps/clkinfostopw/clkinfo.ts b/apps/clkinfostopw/clkinfo.ts index 05d160c30..4a5f36e52 100644 --- a/apps/clkinfostopw/clkinfo.ts +++ b/apps/clkinfostopw/clkinfo.ts @@ -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(); } }