kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 12:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Group filters that only apply when limiting for display

Browse Source
This commit is contained in:
Jonathan Kolb 2022-06-09 09:21:00 -04:00
parent 604a555e14
commit c82de1e314
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/default/calendar/calendar.js
View File

@ -496,23 +496,21 @@ Module.register("calendar", {
for (const e in calendar) { for (const e in calendar) {
const event = JSON.parse(JSON.stringify(calendar[e])); // clone object const event = JSON.parse(JSON.stringify(calendar[e])); // clone object
if (event.endDate < now && limitNumberOfEntries) { if (this.config.hidePrivate && event.class === "PRIVATE") {
continue;
}
if (this.config.hidePrivate) {
if (event.class === "PRIVATE") {
// do not add the current event, skip it // do not add the current event, skip it
continue; continue;
} }
} if (limitNumberOfEntries) {
if (this.config.hideOngoing && limitNumberOfEntries) { if (event.endDate < now) {
if (event.startDate < now) {
continue; continue;
} }
} if (this.config.hideOngoing && event.startDate < now) {
if (this.listContainsEvent(events, event) && limitNumberOfEntries) {
continue; continue;
} }
if (this.listContainsEvent(events, event)) {
continue;
}
}
event.url = calendarUrl; event.url = calendarUrl;
event.today = event.startDate >= today && event.startDate < today + 24 * 60 * 60 * 1000; event.today = event.startDate >= today && event.startDate < today + 24 * 60 * 60 * 1000;