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

Merge pull request #475 from RedNax67/develop

Browse Source 
Deliver additional information in calendar broadcasts
This commit is contained in:
Michael Teeuw
2016-10-20 09:20:30 +02:00
committed by GitHub
parent 1b7fe286a6 2cc9356c32
commit c2df864119
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/default/calendar/calendarfetcher.js
View File

@@ -81,6 +81,7 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
}
}
// calculate the duration f the event for use with recurring events.
var duration = parseInt(endDate.format("x")) - parseInt(startDate.format("x"));
@@ -95,6 +96,10 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
title = event.description;
}
var location = event.location || false;
var geo = event.geo || false;
var description = event.description || false;
if (typeof event.rrule != "undefined" && !isFacebookBirthday) {
var rule = event.rrule;
var dates = rule.between(today, future, true, limitFunction);
@@ -108,7 +113,10 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
startDate: startDate.format("x"),
endDate: endDate.format("x"),
fullDayEvent: isFullDayEvent(event),
firstYear: event.start.getFullYear()
firstYear: event.start.getFullYear(),
location: location,
geo: geo,
description: description
});
}
}
@@ -132,10 +140,6 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
continue;
}
var location = event.location || false;
var geo = event.geo || false;
// Every thing is good. Add it to the list.
newEvents.push({
@@ -143,8 +147,9 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
startDate: startDate.format("x"),
endDate: endDate.format("x"),
fullDayEvent: fullDayEvent,
location: location,
geo: geo
location: location,
geo: geo,
description: description
});
}