anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sometimes time showing as "0:60"

Browse Source
This commit is contained in:
JonnyWong16
2018-01-28 20:19:49 -08:00
parent 7175b57a28
commit 318a21438f
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
data/interfaces/default/js/script.js
View File

@@ -290,19 +290,9 @@ String.prototype.toProperCase = function () {
function millisecondsToMinutes(ms, roundToMinute) { function millisecondsToMinutes(ms, roundToMinute) {
if (ms > 0) { if (ms > 0) {
seconds = ms / 1000; var minutes = Math.floor(ms / 60000);
minutes = seconds / 60; var seconds = ((ms % 60000) / 1000).toFixed(0);
if (roundToMinute) { return (seconds == 60 ? (minutes+1) + ":00" : minutes + ":" + (seconds < 10 ? "0" : "") + seconds);
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;
} else { } else {
if (roundToMinute) { if (roundToMinute) {
return '0'; return '0';