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

Fix Facebook Birthdays - Fix: #97

Browse Source
This commit is contained in:
Michael Teeuw
2016-04-05 11:20:47 +02:00
parent 7b6772e77b
commit 598cf61eb4
3 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,10 @@ Module.register('calendar',{
'De verjaardag van ' : ''
},
loadingText: 'Loading events …',
emptyCalendarText: 'No upcoming events.'
emptyCalendarText: 'No upcoming events.',
// TODO: It would be nice if there is a way to get this from the Moment.js locale.
todayText: 'Today'
},
// Define required scripts.
@@ -112,7 +115,8 @@ Module.register('calendar',{
eventWrapper.appendChild(titleWrapper);
var timeWrapper = document.createElement("td");
timeWrapper.innerHTML = moment(event.startDate,'x').fromNow();
timeWrapper.innerHTML = (event.today) ? this.config.todayText : moment(event.startDate,'x').fromNow();
// timeWrapper.innerHTML = moment(event.startDate,'x').format('lll');
timeWrapper.className = "time light";
eventWrapper.appendChild(timeWrapper);
@@ -160,11 +164,13 @@ Module.register('calendar',{
*/
createEventList: function() {
var events = [];
var today = moment().startOf('day');
for (var c in this.calendarData) {
var calendar = this.calendarData[c];
for (var e in calendar) {
var event = calendar[e];
event.url = c;
event.today = event.startDate >= today && event.startDate < (today + 24 * 60 * 60 * 1000);
events.push(event);
}
}