kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into issue-2022_catch-ical-parsing-errors

Browse Source
This commit is contained in:
Michael Teeuw
2020-12-08 15:13:34 +01:00
committed by GitHub
parent 38d4a8b198 adb50a9623
commit c49386bb58
11 changed files with 831 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/default/calendar/calendarfetcher.js
View File

@@ -385,7 +385,21 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
return a.startDate - b.startDate;
});
events = newEvents.slice(0, maximumEntries);
// include up to maximumEntries current or upcoming events
// If past events should be included, include all past events
const now = moment();
var entries = 0;
events = [];
for (let ne of newEvents) {
if (moment(ne.endDate, "x").isBefore(now)) {
if (includePastEvents) events.push(ne);
continue;
}
entries++;
// If max events has been saved, skip the rest
if (entries > maximumEntries) break;
events.push(ne);
}
self.broadcastEvents();
scheduleTimer();