stopw: show millis for the first minute
parent
a467a81c33
commit
05094f6c51
|
|
@ -2,7 +2,7 @@
|
||||||
var durationOnPause = "---";
|
var durationOnPause = "---";
|
||||||
var redrawInterval;
|
var redrawInterval;
|
||||||
var startTime;
|
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 _a = (require("Storage").readJSON("clkinfostopw.setting.json", true) || {}).format, format = _a === void 0 ? 0 : _a;
|
||||||
var unqueueRedraw = function () {
|
var unqueueRedraw = function () {
|
||||||
if (redrawInterval)
|
if (redrawInterval)
|
||||||
|
|
@ -14,8 +14,8 @@
|
||||||
unqueueRedraw();
|
unqueueRedraw();
|
||||||
redrawInterval = setInterval(function () {
|
redrawInterval = setInterval(function () {
|
||||||
if (startTime) {
|
if (startTime) {
|
||||||
if (!over1s && Date.now() - startTime > 1000) {
|
if (showMillis && Date.now() - startTime > 60000) {
|
||||||
over1s = true;
|
showMillis = false;
|
||||||
changeInterval(redrawInterval, 1000);
|
changeInterval(redrawInterval, 1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -36,7 +36,7 @@
|
||||||
seconds %= 60;
|
seconds %= 60;
|
||||||
if (mins < 60)
|
if (mins < 60)
|
||||||
return format === 0
|
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));
|
: "".concat(mins.toFixed(0), ":").concat(pad2(seconds));
|
||||||
var hours = mins / 60;
|
var hours = mins / 60;
|
||||||
mins %= 60;
|
mins %= 60;
|
||||||
|
|
@ -73,7 +73,7 @@
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
queueRedraw.call(this);
|
queueRedraw.call(this);
|
||||||
over1s = false;
|
showMillis = true;
|
||||||
startTime = Date.now();
|
startTime = Date.now();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
let durationOnPause = "---";
|
let durationOnPause = "---";
|
||||||
let redrawInterval: number | undefined;
|
let redrawInterval: number | undefined;
|
||||||
let startTime: number | undefined;
|
let startTime: number | undefined;
|
||||||
let over1s = false;
|
let showMillis = true;
|
||||||
let { format = StopWatchFormat.HMS }: StopWatchSettings
|
let { format = StopWatchFormat.HMS }: StopWatchSettings
|
||||||
= require("Storage").readJSON("clkinfostopw.setting.json", true) || {};
|
= require("Storage").readJSON("clkinfostopw.setting.json", true) || {};
|
||||||
|
|
||||||
|
|
@ -15,8 +15,8 @@
|
||||||
unqueueRedraw();
|
unqueueRedraw();
|
||||||
redrawInterval = setInterval(() => {
|
redrawInterval = setInterval(() => {
|
||||||
if (startTime) {
|
if (startTime) {
|
||||||
if (!over1s && Date.now() - startTime > 1000) {
|
if (showMillis && Date.now() - startTime > 60000) {
|
||||||
over1s = true;
|
showMillis = false;
|
||||||
changeInterval(redrawInterval, 1000);
|
changeInterval(redrawInterval, 1000);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -80,7 +80,7 @@
|
||||||
startTime = undefined; // this also unqueues the redraw
|
startTime = undefined; // this also unqueues the redraw
|
||||||
} else {
|
} else {
|
||||||
queueRedraw.call(this);
|
queueRedraw.call(this);
|
||||||
over1s = false;
|
showMillis = true;
|
||||||
startTime = Date.now();
|
startTime = Date.now();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue