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

Cleaned CM.Disp.FormatTime

Browse Source
This commit is contained in:
Daniel van Noord
2020-12-02 21:53:19 +01:00
parent 8bbec4c8a4
commit 0f5291b41c
2 changed files with 40 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
CookieMonster.js
View File

@@ -844,55 +844,30 @@ CM.Data.ValCookies = ['Pure heart biscuits', 'Ardent heart biscuits', 'Sour hear
* Disp * * Disp *
********/ ********/
CM.Disp.FormatTime = function(time, format) { // General functions to format or beautify strings
CM.Disp.FormatTime = function(time, longFormat) {
if (time == Infinity) return time; if (time == Infinity) return time;
time = Math.ceil(time);
var y = Math.floor(time / 31557600);
var d = Math.floor(time % 31557600 / 86400);
var h = Math.floor(time % 86400 / 3600);
var m = Math.floor(time % 3600 / 60);
var s = Math.floor(time % 60);
var str = '';
if (CM.Config.TimeFormat) { if (CM.Config.TimeFormat) {
if (time > 3155760000) return 'XX:XX:XX:XX:XX'; if (time > 3155760000) return 'XX:XX:XX:XX:XX';
time = Math.ceil(time); str += (y < 10 ? '0' : '') + y + ':';
var y = Math.floor(time / 31557600); str += (d < 10 ? '0' : '') + d + ':';
var d = Math.floor(time % 31557600 / 86400); str += (h < 10 ? '0' : '') + h + ':';
var h = Math.floor(time % 86400 / 3600); str += (m < 10 ? '0' : '') + m + ':';
var m = Math.floor(time % 3600 / 60); str += (s < 10 ? '0' : '') + s + ':';
var s = Math.floor(time % 60);
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 { } else {
if (time > 777600000) return format ? 'Over 9000 days!' : '>9000d'; if (time > 777600000) return longFormat ? 'Over 9000 days!' : '>9000d';
time = Math.ceil(time); str += (d > 0 ? d + (longFormat ? (d == 1 ? ' day' : ' days') : 'd') + ', ': "");
var d = Math.floor(time / 86400); if (str.length > 0 || h > 0) str += h + (longFormat ? (h == 1 ? ' hour' : ' hours') : 'h') + ', ';
var h = Math.floor(time % 86400 / 3600); if (str.length > 0 || m > 0) str += m + (longFormat ? (m == 1 ? ' minute' : ' minutes') : 'm') + ', ';
var m = Math.floor(time % 3600 / 60); str += s + (longFormat ? (s == 1 ? ' second' : ' seconds') : 's');
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');
} }
return str; return str;
} }

65
src/Disp.js
View File

@@ -2,55 +2,30 @@
* Disp * * Disp *
********/ ********/
CM.Disp.FormatTime = function(time, format) { // General functions to format or beautify strings
CM.Disp.FormatTime = function(time, longFormat) {
if (time == Infinity) return time; if (time == Infinity) return time;
time = Math.ceil(time);
var y = Math.floor(time / 31557600);
var d = Math.floor(time % 31557600 / 86400);
var h = Math.floor(time % 86400 / 3600);
var m = Math.floor(time % 3600 / 60);
var s = Math.floor(time % 60);
var str = '';
if (CM.Config.TimeFormat) { if (CM.Config.TimeFormat) {
if (time > 3155760000) return 'XX:XX:XX:XX:XX'; if (time > 3155760000) return 'XX:XX:XX:XX:XX';
time = Math.ceil(time); str += (y < 10 ? '0' : '') + y + ':';
var y = Math.floor(time / 31557600); str += (d < 10 ? '0' : '') + d + ':';
var d = Math.floor(time % 31557600 / 86400); str += (h < 10 ? '0' : '') + h + ':';
var h = Math.floor(time % 86400 / 3600); str += (m < 10 ? '0' : '') + m + ':';
var m = Math.floor(time % 3600 / 60); str += (s < 10 ? '0' : '') + s + ':';
var s = Math.floor(time % 60);
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 { } else {
if (time > 777600000) return format ? 'Over 9000 days!' : '>9000d'; if (time > 777600000) return longFormat ? 'Over 9000 days!' : '>9000d';
time = Math.ceil(time); str += (d > 0 ? d + (longFormat ? (d == 1 ? ' day' : ' days') : 'd') + ', ': "");
var d = Math.floor(time / 86400); if (str.length > 0 || h > 0) str += h + (longFormat ? (h == 1 ? ' hour' : ' hours') : 'h') + ', ';
var h = Math.floor(time % 86400 / 3600); if (str.length > 0 || m > 0) str += m + (longFormat ? (m == 1 ? ' minute' : ' minutes') : 'm') + ', ';
var m = Math.floor(time % 3600 / 60); str += s + (longFormat ? (s == 1 ? ' second' : ' seconds') : 's');
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');
} }
return str; return str;
} }