dburr/SIFTools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't put parenthesis if time remaining < 24 hrs

Browse source
This commit is contained in:
Donald Burr 2015-10-31 23:25:04 -07:00
parent 7827439085
commit 53137ab8a2
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
web_app/js/sif_tools.js
View file

@ -27,7 +27,6 @@
// * Card Level Calc: // * Card Level Calc:
// - maybe also the super (1.5) and ultra (2.0) success bonuses too? // - maybe also the super (1.5) and ultra (2.0) success bonuses too?
// * Event Tracker: // * Event Tracker:
// - if time remaining < 24 don't put parenthesis around the hours/minutes/seconds display
// - @sifen_trackbot update code gets "stuck" sometimes - not sure if the problem // - @sifen_trackbot update code gets "stuck" sometimes - not sure if the problem
// is in the twitter fetcher or elsewhere // is in the twitter fetcher or elsewhere
@ -1049,14 +1048,16 @@ function run_timer() {
if (total_hours >= 24) { if (total_hours >= 24) {
time_till += sprintf("%d hours<br />", total_hours); time_till += sprintf("%d hours<br />", total_hours);
} }
if (total_hours >= 24) {
time_till += "("; time_till += "(";
}
if (days >= 1) { if (days >= 1) {
time_till += sprintf("%d day%s ", days, days > 1 ? "s" : ""); time_till += sprintf("%d day%s ", days, days > 1 ? "s" : "");
} }
if (hours >= 1) { if (hours >= 1) {
time_till += sprintf("%d hour%s ", hours, hours > 1 ? "s" : ""); time_till += sprintf("%d hour%s ", hours, hours > 1 ? "s" : "");
} }
time_till += sprintf("%d minute%s %d second%s)</h2>", minutes, minutes > 1 ? "s" : "", seconds, seconds > 1 ? "s" : ""); time_till += sprintf("%d minute%s %d second%s%s</h2>", minutes, minutes > 1 ? "s" : "", seconds, (seconds > 1 ? "s" : ""), (total_hours >= 24) ? ")" : "");
// d.asDays() + " days " + d.asHours() + moment.utc(ms).format(":mm:ss"); // d.asDays() + " days " + d.asHours() + moment.utc(ms).format(":mm:ss");
// var time_till = moment.utc(end.diff(now)).format("HH:mm:ss");//.format("HH:mm:ss"); // var time_till = moment.utc(end.diff(now)).format("HH:mm:ss");//.format("HH:mm:ss");
string += "<h1>TIME REMAINING:</h1><h2>" + time_till + "</H2>"; string += "<h1>TIME REMAINING:</h1><h2>" + time_till + "</H2>";