diff --git a/public/js/misc.js b/public/js/misc.js index f41c8fb9c..a6b922ffb 100644 --- a/public/js/misc.js +++ b/public/js/misc.js @@ -269,3 +269,21 @@ function getGibberish() { } return ret; } + +function secondsToString(sec) { + hours = Math.floor(sec / 3600); + minutes = Math.floor((sec % 3600) / 60); + seconds = (sec % 3600) % 60; + let hoursString; + let minutesString; + let secondsString; + hours < 10 ? (hoursString = "0" + hours) : (hoursString = hours); + minutes < 10 ? (minutesString = "0" + minutes) : (minutesString = minutes); + seconds < 10 ? (secondsString = "0" + seconds) : (secondsString = seconds); + + let ret = ""; + if (hours > 0) ret += hoursString + ":"; + if (minutes > 0) ret += minutesString + ":"; + ret += secondsString; + return ret; +} diff --git a/public/js/script.js b/public/js/script.js index 1d541f6bc..b4bde2862 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -839,20 +839,21 @@ function updateTimer() { "linear" ); } else if (config.timerStyle === "text") { - var displayTime = new Date(null); - displayTime.setSeconds(config.time - time); - displayTime = displayTime.toISOString().substr(11, 8); - while ( - displayTime.substr(0, 2) == "00" || - displayTime[0] == ":" || - (displayTime.length == 2 && displayTime[0] == "0") - ) { - if (displayTime.substr(0, 2) == "00") { - displayTime = displayTime.substr(3); - } else { - displayTime = displayTime.substr(1); - } - } + // var displayTime = new Date(null); + // displayTime.setSeconds(config.time - time); + // displayTime = displayTime.toISOString().substr(11, 8); + // while ( + // displayTime.substr(0, 2) == "00" || + // displayTime[0] == ":" || + // (displayTime.length == 2 && displayTime[0] == "0") + // ) { + // if (displayTime.substr(0, 2) == "00") { + // displayTime = displayTime.substr(3); + // } else { + // displayTime = displayTime.substr(1); + // } + // } + let displayTime = secondsToString(config.time - time); $("#timerNumber").html(displayTime); // $("#timerNumber").html(config.time - time); }