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

Finish loading empty calendars. Fixes issue: #124

Browse Source
This commit is contained in:
Michael Teeuw
2016-04-05 10:01:54 +02:00
parent 700ebc53f8
commit c4bfa6d4d8
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,9 @@ Module.register('calendar',{
],
titleReplace: {
'De verjaardag van ' : ''
}
},
loadingText: 'Loading events …',
emptyCalendarText: 'No upcoming events.'
},
// Define required scripts.
@@ -55,6 +57,7 @@ Module.register('calendar',{
}
this.calendarData = {};
this.loaded = false;
},
// Override socket notification handler.
@@ -62,6 +65,7 @@ Module.register('calendar',{
if (notification === 'CALENDAR_EVENTS') {
if (this.hasCalendarURL(payload.url)) {
this.calendarData[payload.url] = payload.events;
this.loaded = true;
}
} else if(notification === 'FETCH_ERROR') {
Log.error('Calendar Error. Could not fetch calendar: ' + payload.url);
@@ -82,7 +86,7 @@ Module.register('calendar',{
wrapper.className = "small";
if (events.length === 0) {
wrapper.innerHTML = "Loading events ...";
wrapper.innerHTML = (this.loaded) ? this.config.emptyCalendarText : this.config.loadingText;
wrapper.className = "small dimmed";
return wrapper;
}