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

Show text when event is still running.

Browse Source
This commit is contained in:
Michael Teeuw
2016-04-15 13:13:06 +02:00
parent 614e5e62af
commit 27a47d4e4a
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,8 @@ Module.register("calendar",{
emptyCalendarText: "No upcoming events.",
// TODO: It would be nice if there is a way to get this from the Moment.js locale.
todayText: "Today"
todayText: "Today",
runningText: "Ends in"
},
// Define required scripts.
@@ -119,7 +120,11 @@ Module.register("calendar",{
if (event.fullDayEvent) {
timeWrapper.innerHTML = (event.today) ? this.config.todayText : moment(event.startDate,"x").fromNow();
} else {
timeWrapper.innerHTML = moment(event.startDate,"x").fromNow();
if (event.startDate >= new Date()) {
timeWrapper.innerHTML = moment(event.startDate,"x").fromNow();
} else {
timeWrapper.innerHTML = this.config.runningText + ' ' + moment(event.endDate,"x").fromNow(true);
}
}
// timeWrapper.innerHTML = moment(event.startDate,'x').format('lll');
timeWrapper.className = "time light";