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

fix subsequent calendar fetcher timing

Browse Source
This commit is contained in:
Sam Detweiler
2020-10-11 22:39:42 -05:00
parent 6ec0aa8894
commit a3bad8aec4
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ Module.register("calendar", {
timeFormat: "relative",
dateFormat: "MMM Do",
dateEndFormat: "LT",
fullDayEventDateFormat: "MMM Do",
fullDayEventDateFormat: "MMM Do HH:mm",
showEnd: false,
getRelative: 6,
fadePoint: 0.25, // Start on 1/4th of the list.
@@ -41,7 +41,7 @@ Module.register("calendar", {
calendars: [
{
symbol: "calendar",
url: "https://www.calendarlabs.com/templates/ical/US-Holidays.ics"
url: "https://www.calendarlabs.com/templates/ical/US-Holidays.ics1"
}
],
titleReplace: {
@@ -58,6 +58,8 @@ Module.register("calendar", {
nextDaysRelative: false
},
requiresVersion: "2.1.0",
// Define required scripts.
getStyles: function () {
return ["calendar.css", "font-awesome.css"];
@@ -114,12 +116,12 @@ Module.register("calendar", {
this.addCalendar(calendar.url, calendar.auth, calendarConfig);
// Trigger ADD_CALENDAR every fetchInterval to make sure there is always a calendar
/* // Trigger ADD_CALENDAR every fetchInterval to make sure there is always a calendar
// fetcher running on the server side.
var self = this;
setInterval(function () {
self.addCalendar(calendar.url, calendar.auth, calendarConfig);
}, self.config.fetchInterval);
}, self.config.fetchInterval); */
}
this.calendarData = {};
@@ -541,6 +543,8 @@ Module.register("calendar", {
* @param {object} calendarConfig The config of the specific calendar
*/
addCalendar: function (url, auth, calendarConfig) {
var self = this;
this.sendSocketNotification("ADD_CALENDAR", {
id: this.identifier,
url: url,
@@ -554,6 +558,9 @@ Module.register("calendar", {
auth: auth,
broadcastPastEvents: calendarConfig.broadcastPastEvents || this.config.broadcastPastEvents
});
setTimeout(() => {
self.addCalendar(url, auth, calendarConfig);
}, self.config.fetchInterval);
},
/**