sites
/
thelinux.pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
Kameron Kenny 2019-05-30 11:43:04 -04:00
parent ab4dcaf4d1
commit 3714afe26a
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
broadcast_timer/events.js
View File

@ -94,6 +94,7 @@ var events = [
"subject": "Andy's Sheet for CapAdd", "subject": "Andy's Sheet for CapAdd",
"notes": "" "notes": ""
}, },
{
"date": "May 30, 2019 14:30:00", "date": "May 30, 2019 14:30:00",
"subject": "TD's for JS vuln", "subject": "TD's for JS vuln",
"notes": "https://github.exacttarget.com/tholt/jvmversions results repo" "notes": "https://github.exacttarget.com/tholt/jvmversions results repo"

2
broadcast_timer/main.js
View File

@ -1,5 +1,5 @@
// meta // meta
var version = "0.10.012" var version = "0.10.013"
var debug = false; var debug = false;

35
broadcast_timer/timerMath.js
View File

@ -26,31 +26,12 @@ function countdown(targetDate, current) {
minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60)); minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
seconds = Math.floor((distance % (1000 * 60)) / 1000); seconds = Math.floor((distance % (1000 * 60)) / 1000);
// Day or Days?
if (days > 0) {
if (days === 1){
rDays = (days + ' Day ');
} else {
rDays = (days + ' Days ');
}
} else {
rDays = '';
}
// set style for countdown based on remaining time // set style for countdown based on remaining time
style = "green"; // reset style style = "green"; // reset style
if (current === "current") { if (current === "current") {
style = 'current'; style = 'current';
/* if (nextDays < 1 && nextHours < 1) {
if (nextMinutes < 0) {
style = 'over';
} else if (nextMinutes < 15) {
style = 'warn';
} else {
style = 'green';
}
} */
} else { } else {
if (days < 1 && hours < 1) { if (days < 1 && hours < 1) {
if (minutes < 0) { if (minutes < 0) {
@ -63,6 +44,22 @@ function countdown(targetDate, current) {
} }
} }
if (days < 0) {
days = (-days);
days--;
}
// Day or Days?
if (days > 0) {
if (days === 1){
rDays = (days + ' Day ');
} else {
rDays = (days + ' Days ');
}
} else {
rDays = '';
}
// pad single digits with a '0' prefix // pad single digits with a '0' prefix
// when time is out, start counting up by inverting // when time is out, start counting up by inverting
if (hours < 0) { if (hours < 0) {