From bd9557b11eda2455ae3e7b6dc129736a8a15e1bb Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 23 Apr 2016 17:40:44 +0200 Subject: [PATCH] Prevent display of events in the past. #162 --- modules/default/calendar/calendar.js | 5 +++-- modules/default/calendar/calendarfetcher.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index c1ffc492..5e315586 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -124,7 +124,7 @@ Module.register("calendar",{ if (event.fullDayEvent) { if (event.today) { timeWrapper.innerHTML = this.translate("TODAY"); - } else if (event.startDate - now < 24 * 60 * 60 * 1000) { + } else if (event.startDate - now < 24 * 60 * 60 * 1000 && event.startDate - now > 0) { timeWrapper.innerHTML = this.translate("TOMORROW"); } else { timeWrapper.innerHTML = moment(event.startDate,"x").fromNow(); @@ -141,7 +141,8 @@ Module.register("calendar",{ timeWrapper.innerHTML = this.translate("RUNNING") + ' ' + moment(event.endDate,"x").fromNow(true); } } - // timeWrapper.innerHTML = moment(event.startDate,'x').format('lll'); + //timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll'); + //console.log(event); timeWrapper.className = "time light"; eventWrapper.appendChild(timeWrapper); diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js index 771ee5b3..ac558e2f 100644 --- a/modules/default/calendar/calendarfetcher.js +++ b/modules/default/calendar/calendarfetcher.js @@ -99,7 +99,7 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe continue; } - if (fullDayEvent && endDate < today) { + if (fullDayEvent && endDate <= today) { //console.log("It's a fullday event, and it is before today. So skip: " + title); continue; }