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

limitDays and coloredEvents are now only module-wide options, not per calendar.

Browse Source
This commit is contained in:
Johan Alvinger 2020-11-24 15:41:28 +01:00
parent 20a50f8382
commit 056f3a6ccb
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,6 @@ Module.register("calendar", {
var calendarConfig = { var calendarConfig = {
maximumEntries: calendar.maximumEntries, maximumEntries: calendar.maximumEntries,
maximumNumberOfDays: calendar.maximumNumberOfDays, maximumNumberOfDays: calendar.maximumNumberOfDays,
limitDays: calendar.limitDays,
broadcastPastEvents: calendar.broadcastPastEvents broadcastPastEvents: calendar.broadcastPastEvents
}; };
if (calendar.symbolClass === "undefined" || calendar.symbolClass === null) { if (calendar.symbolClass === "undefined" || calendar.symbolClass === null) {
@ -567,7 +566,6 @@ Module.register("calendar", {
excludedEvents: calendarConfig.excludedEvents || this.config.excludedEvents, excludedEvents: calendarConfig.excludedEvents || this.config.excludedEvents,
maximumEntries: calendarConfig.maximumEntries || this.config.maximumEntries, maximumEntries: calendarConfig.maximumEntries || this.config.maximumEntries,
maximumNumberOfDays: calendarConfig.maximumNumberOfDays || this.config.maximumNumberOfDays, maximumNumberOfDays: calendarConfig.maximumNumberOfDays || this.config.maximumNumberOfDays,
limitDays: calendarConfig.limitDays || this.config.limitDays,
fetchInterval: this.config.fetchInterval, fetchInterval: this.config.fetchInterval,
symbolClass: calendarConfig.symbolClass, symbolClass: calendarConfig.symbolClass,
titleClass: calendarConfig.titleClass, titleClass: calendarConfig.titleClass,