kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-03 06:15:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67 from The-Flix/patch-1

Browse Source 
Update calendar.js
This commit is contained in:
Michael Teeuw 2016-01-31 15:17:15 +01:00
commit 5d4a879d40
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/calendar/calendar.js
View File

@ -79,7 +79,7 @@ calendar.processEvents = function (url, events) {
this.eventList.push({'description':e.SUMMARY,'seconds':seconds,'days':time_string,'url': url, symbol: this.calendarSymbol}); this.eventList.push({'description':e.SUMMARY,'seconds':seconds,'days':time_string,'url': url, symbol: this.calendarSymbol});
} }
e.seconds = seconds; e.seconds = seconds;
} else if (endSeconds >= 0) { } else if (endSeconds > 0) {
// TODO: Replace with better lang handling // TODO: Replace with better lang handling
if (endSeconds <= 60*60*5 || endSeconds >= 60*60*24*2) { if (endSeconds <= 60*60*5 || endSeconds >= 60*60*24*2) {
var time_string = this.shortRunningText + ' ' + moment(endDate).fromNow(true); var time_string = this.shortRunningText + ' ' + moment(endDate).fromNow(true);