From 318a21438f3ebc49ef1f21fb22ca7b314113a658 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 28 Jan 2018 20:19:49 -0800 Subject: [PATCH] Fix sometimes time showing as "0:60" --- data/interfaces/default/js/script.js | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index efbc47e7..4d62286e 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -290,19 +290,9 @@ String.prototype.toProperCase = function () { function millisecondsToMinutes(ms, roundToMinute) { if (ms > 0) { - seconds = ms / 1000; - minutes = seconds / 60; - if (roundToMinute) { - output = Math.round(minutes, 0) - } else { - minutesFloor = Math.floor(minutes); - secondsReal = Math.round((seconds - (minutesFloor * 60)), 0); - if (secondsReal < 10) { - secondsReal = '0' + secondsReal; - } - output = minutesFloor + ':' + secondsReal; - } - return output; + var minutes = Math.floor(ms / 60000); + var seconds = ((ms % 60000) / 1000).toFixed(0); + return (seconds == 60 ? (minutes+1) + ":00" : minutes + ":" + (seconds < 10 ? "0" : "") + seconds); } else { if (roundToMinute) { return '0';