CSS, sort events array
This commit is contained in:
parent
6177912c64
commit
2d7e955f8e
|
@ -4,8 +4,9 @@ body {
|
||||||
.warn { color: yellow; }
|
.warn { color: yellow; }
|
||||||
.green { color: lime; }
|
.green { color: lime; }
|
||||||
.over { color: red; }
|
.over { color: red; }
|
||||||
|
.current { color: orange; }
|
||||||
.events-current {
|
.events-current {
|
||||||
background: #666; }
|
background: #555; }
|
||||||
.subject {
|
.subject {
|
||||||
float: left;
|
float: left;
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
// meta
|
// meta
|
||||||
var version = "0.10.3"
|
var version = "0.10.010"
|
||||||
var debug = false;
|
var debug = false;
|
||||||
|
|
||||||
|
|
||||||
|
events.sort(function(a, b){return new Date(a.date).getTime() - new Date(b.date).getTime()});
|
||||||
|
|
||||||
var initialized = false;
|
var initialized = false;
|
||||||
|
|
||||||
var style = 'green';
|
var style = 'green';
|
||||||
|
@ -27,6 +30,7 @@ var nextEnd = events[(nextObject + 1)].date;
|
||||||
var currentSubject = events[currentObject].subject;
|
var currentSubject = events[currentObject].subject;
|
||||||
var nextSubject = events[nextObject].subject;
|
var nextSubject = events[nextObject].subject;
|
||||||
|
|
||||||
|
|
||||||
// Set the date we're counting down to
|
// Set the date we're counting down to
|
||||||
var countDownDate = new Date(nextDate).getTime();
|
var countDownDate = new Date(nextDate).getTime();
|
||||||
var currentTimer = new Date(currentDate).getTime();
|
var currentTimer = new Date(currentDate).getTime();
|
||||||
|
|
|
@ -41,7 +41,8 @@ function countdown(targetDate, current) {
|
||||||
style = "green"; // reset style
|
style = "green"; // reset style
|
||||||
|
|
||||||
if (current === "current") {
|
if (current === "current") {
|
||||||
if (nextDays < 1 && nextHours < 1) {
|
style = 'current';
|
||||||
|
/* if (nextDays < 1 && nextHours < 1) {
|
||||||
if (nextMinutes < 0) {
|
if (nextMinutes < 0) {
|
||||||
style = 'over';
|
style = 'over';
|
||||||
} else if (nextMinutes < 15) {
|
} else if (nextMinutes < 15) {
|
||||||
|
@ -49,7 +50,7 @@ function countdown(targetDate, current) {
|
||||||
} else {
|
} else {
|
||||||
style = 'green';
|
style = 'green';
|
||||||
}
|
}
|
||||||
}
|
} */
|
||||||
} else {
|
} else {
|
||||||
if (days < 1 && hours < 1) {
|
if (days < 1 && hours < 1) {
|
||||||
if (minutes < 0) {
|
if (minutes < 0) {
|
||||||
|
|
Loading…
Reference in New Issue