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

Run prettier

Browse Source
This commit is contained in:
rejas
2021-12-21 15:22:52 +01:00
parent 9c4c77fe84
commit 405ec82dd0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,9 +368,9 @@ Module.register("calendar", {
} }
} else { } else {
// Show relative times // Show relative times
if ((event.startDate >= now) || (event.fullDayEvent && event.today)) { if (event.startDate >= now || (event.fullDayEvent && event.today)) {
// Use relative time // Use relative time
if ((!this.config.hideTime) && (!event.fullDayEvent)) { if (!this.config.hideTime && !event.fullDayEvent) {
timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar(null, { sameElse: this.config.dateFormat })); timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar(null, { sameElse: this.config.dateFormat }));
} else { } else {
timeWrapper.innerHTML = this.capFirst( timeWrapper.innerHTML = this.capFirst(
@@ -378,7 +378,7 @@ Module.register("calendar", {
sameDay: "[" + this.translate("TODAY") + "]", sameDay: "[" + this.translate("TODAY") + "]",
nextDay: "[" + this.translate("TOMORROW") + "]", nextDay: "[" + this.translate("TOMORROW") + "]",
nextWeek: "dddd", nextWeek: "dddd",
sameElse: (event.fullDayEvent ? this.config.fullDayEventDateFormat : this.config.dateFormat) sameElse: event.fullDayEvent ? this.config.fullDayEventDateFormat : this.config.dateFormat
}) })
); );
} }
@@ -396,7 +396,8 @@ Module.register("calendar", {
} else if (event.startDate - now < this.config.getRelative * oneHour) { } else if (event.startDate - now < this.config.getRelative * oneHour) {
// If event is within getRelative hours, display 'in xxx' time format or moment.fromNow() // If event is within getRelative hours, display 'in xxx' time format or moment.fromNow()
timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow()); timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
} } else { }
} else {
// Ongoing event // Ongoing event
timeWrapper.innerHTML = this.capFirst( timeWrapper.innerHTML = this.capFirst(
this.translate("RUNNING", { this.translate("RUNNING", {