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

Merge branch 'develop' into unittest-calendar

Browse Source
This commit is contained in:
Michael Teeuw
2017-07-31 15:04:16 +02:00
committed by GitHub
parent 35e3b889c3 bb7faf0fb3
commit 18b61e35be
7 changed files with 77 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,20 +153,6 @@ Module.register("calendar", {
for (var e in events) {
var event = events[e];
var excluded = false;
for (var f in this.config.excludedEvents) {
var filter = this.config.excludedEvents[f];
if (event.title.toLowerCase().includes(filter.toLowerCase())) {
excluded = true;
break;
}
}
if (excluded) {
continue;
}
var eventWrapper = document.createElement("tr");
if (this.config.colored) {
@@ -366,7 +352,7 @@ Module.register("calendar", {
return a.startDate - b.startDate;
});
return events.slice(0, this.config.maximumEntries);
return events;
},
/* createEventList(url)
@@ -377,6 +363,7 @@ Module.register("calendar", {
addCalendar: function (url, auth, calendarConfig) {
this.sendSocketNotification("ADD_CALENDAR", {
url: url,
excludedEvents: calendarConfig.excludedEvents || this.config.excludedEvents,
maximumEntries: calendarConfig.maximumEntries || this.config.maximumEntries,
maximumNumberOfDays: calendarConfig.maximumNumberOfDays || this.config.maximumNumberOfDays,
fetchInterval: this.config.fetchInterval,