david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added an "if" for the XX:XX:XX:XX:XX time format

Browse Source 
Maybe the "if" is constructed backwards... simply a matter of changing the 1 to 0 in the condition. Otherwise I think it's good.
This commit is contained in:
Jean-Christophe Bourgault
2016-05-01 22:45:55 -04:00
parent 3ce5164abb
commit c3e85afb85
1 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/Disp.js
View File

@@ -4,24 +4,54 @@
CM.Disp.FormatTime = function(time, format) { CM.Disp.FormatTime = function(time, format) {
if (time == 'Infinity') return time; if (time == 'Infinity') return time;
if (time > 777600000) return format ? 'Over 9000 days!' : '>9000d'; if (CM.ConfigData.TimeFormat == 1) {
time = Math.ceil(time); if (time > 3153600000) return 'XX:XX:XX:XX:XX';
var d = Math.floor(time / 86400); time = Math.ceil(time);
var h = Math.floor(time % 86400 / 3600); var y = Math.floor(time / 31536000);
var m = Math.floor(time % 3600 / 60); var d = Math.floor(time % 31536000 / 86400);
var s = Math.floor(time % 60); var h = Math.floor(time % 86400 / 3600);
var str = ''; var m = Math.floor(time % 3600 / 60);
if (d > 0) { var s = Math.floor(time % 60);
str += d + (format ? (d == 1 ? ' day' : ' days') : 'd') + ', '; var str = '';
if (y < 10) {
str += '0';
}
str += y + ':';
if (d < 10) {
str += '0';
}
str += d + ':';
if (h < 10) {
str += '0';
}
str += h + ':';
if (m < 10) {
str += '0';
}
str += m + ':';
if (s < 10) {
str += '0';
}
str += s + ':';
} else {
if (time > 777600000) return format ? 'Over 9000 days!' : '>9000d';
time = Math.ceil(time);
var d = Math.floor(time / 86400);
var h = Math.floor(time % 86400 / 3600);
var m = Math.floor(time % 3600 / 60);
var s = Math.floor(time % 60);
var str = '';
if (d > 0) {
str += d + (format ? (d == 1 ? ' day' : ' days') : 'd') + ', ';
}
if (str.length > 0 || h > 0) {
str += h + (format ? (h == 1 ? ' hour' : ' hours') : 'h') + ', ';
}
if (str.length > 0 || m > 0) {
str += m + (format ? (m == 1 ? ' minute' : ' minutes') : 'm') + ', ';
}
str += s + (format ? (s == 1 ? ' second' : ' seconds') : 's');
} }
if (str.length > 0 || h > 0) {
str += h + (format ? (h == 1 ? ' hour' : ' hours') : 'h') + ', ';
}
if (str.length > 0 || m > 0) {
str += m + (format ? (m == 1 ? ' minute' : ' minutes') : 'm') + ', ';
}
str += s + (format ? (s == 1 ? ' second' : ' seconds') : 's');
return str; return str;
} }