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

Fix: #162, Possible fix for: #197

Browse Source
This commit is contained in:
Michael Teeuw
2016-04-19 10:34:14 +02:00
parent a7948ee1da
commit 095f08d443
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,13 @@ Module.register("calendar",{
timeWrapper.innerHTML = (event.today) ? this.config.todayText : moment(event.startDate,"x").fromNow();
} else {
if (event.startDate >= new Date()) {
timeWrapper.innerHTML = moment(event.startDate,"x").fromNow();
var now = new Date();
if (event.startDate - now > 48 * 60 * 60 * 1000) {
// if the event is no longer than 2 days away, display the absolute time.
timeWrapper.innerHTML = moment(event.startDate,"x").fromNow();
} else {
timeWrapper.innerHTML = moment(event.startDate,"x").calendar();
}
} else {
timeWrapper.innerHTML = this.config.runningText + ' ' + moment(event.endDate,"x").fromNow(true);
}