From 9bc8f54233c0074e5f21e6fb5a6fd32e5506399d Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Tue, 10 May 2016 12:24:49 +0200 Subject: [PATCH] Fix issue with calendar events without title. #221 --- modules/default/calendar/calendarfetcher.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js index 00a17fd9..15c2e60a 100644 --- a/modules/default/calendar/calendarfetcher.js +++ b/modules/default/calendar/calendarfetcher.js @@ -74,6 +74,13 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe 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) { var rule = event.rrule; 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'); if (endDate.format("x") > now) { newEvents.push({ - title: (typeof event.summary.val !== "undefined") ? event.summary.val : event.summary, + title: title, startDate: startDate.format("x"), endDate: endDate.format("x"), fullDayEvent: isFullDayEvent(event), @@ -95,7 +102,6 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe // console.log("Single event ..."); // Single event. var fullDayEvent = (isFacebookBirthday) ? true : isFullDayEvent(event); - var title = (typeof event.summary.val !== "undefined") ? event.summary.val : event.summary; if (!fullDayEvent && endDate < new Date()) { //console.log("It's not a fullday event, and it is in the past. So skip: " + title);