kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue with calendar events without title. #221

Browse Source
This commit is contained in:
Michael Teeuw 2016-05-10 12:24:49 +02:00
parent a1cb82e7db
commit 9bc8f54233
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,13 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
startDate = startDate.startOf("day"); startDate = startDate.startOf("day");
} }
var title = "Event";
if (event.summary) {
title = (typeof event.summary.val !== "undefined") ? event.summary.val : event.summary;
} else if(event.description) {
title = event.description;
}
if (typeof event.rrule != "undefined" && !isFacebookBirthday) { if (typeof event.rrule != "undefined" && !isFacebookBirthday) {
var rule = event.rrule; var rule = event.rrule;
var dates = rule.between(today, future, true, limitFunction); var dates = rule.between(today, future, true, limitFunction);
@ -83,7 +90,7 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
endDate = moment(parseInt(startDate.format("x")) + duration, 'x'); endDate = moment(parseInt(startDate.format("x")) + duration, 'x');
if (endDate.format("x") > now) { if (endDate.format("x") > now) {
newEvents.push({ newEvents.push({
title: (typeof event.summary.val !== "undefined") ? event.summary.val : event.summary, title: title,
startDate: startDate.format("x"), startDate: startDate.format("x"),
endDate: endDate.format("x"), endDate: endDate.format("x"),
fullDayEvent: isFullDayEvent(event), fullDayEvent: isFullDayEvent(event),
@ -95,7 +102,6 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
// console.log("Single event ..."); // console.log("Single event ...");
// Single event. // Single event.
var fullDayEvent = (isFacebookBirthday) ? true : isFullDayEvent(event); var fullDayEvent = (isFacebookBirthday) ? true : isFullDayEvent(event);
var title = (typeof event.summary.val !== "undefined") ? event.summary.val : event.summary;
if (!fullDayEvent && endDate < new Date()) { if (!fullDayEvent && endDate < new Date()) {
//console.log("It's not a fullday event, and it is in the past. So skip: " + title); //console.log("It's not a fullday event, and it is in the past. So skip: " + title);