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

Merge remote-tracking branch 'upstream/develop' into excluded_events

Browse Source
This commit is contained in:
Andrew McOlash
2017-03-17 07:25:42 -05:00
parent 5466e1b733 9c604a7886
commit 4d3b6b1486
26 changed files with 597 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,10 +73,18 @@ Module.register("calendar", {
var calendarConfig = {
maximumEntries: calendar.maximumEntries,
maximumNumberOfDays: calendar.maximumNumberOfDays,
maximumNumberOfDays: calendar.maximumNumberOfDays
};
this.addCalendar(calendar.url, calendar.user, calendar.pass, calendarConfig);
// we check user and password here for backwards compatibility with old configs
if(calendar.user && calendar.pass){
calendar.auth = {
user: calendar.user,
pass: calendar.pass
}
}
this.addCalendar(calendar.url, calendar.auth, calendarConfig);
}
this.calendarData = {};
@@ -327,14 +335,13 @@ Module.register("calendar", {
*
* argument url string - Url to add.
*/
addCalendar: function (url, user, pass, calendarConfig) {
addCalendar: function (url, auth, calendarConfig) {
this.sendSocketNotification("ADD_CALENDAR", {
url: url,
maximumEntries: calendarConfig.maximumEntries || this.config.maximumEntries,
maximumNumberOfDays: calendarConfig.maximumNumberOfDays || this.config.maximumNumberOfDays,
fetchInterval: this.config.fetchInterval,
user: user,
pass: pass
auth: auth
});
},