kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

fix fullday/showend conflict #2629

Browse Source
This commit is contained in:
Sam Detweiler 2022-03-27 09:16:25 -05:00
parent a143ebc8e0
commit cdd87436be
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -35,6 +35,7 @@ _This release is scheduled to be released on 2022-04-01._
- Fix minor console output issue for loading translations (#2814). - Fix minor console output issue for loading translations (#2814).
- Don't adjust startDate for full day events if endDate is in the past - Don't adjust startDate for full day events if endDate is in the past
- Fix windspeed conversion error in openweathermap provider. (#2812) - Fix windspeed conversion error in openweathermap provider. (#2812)
- Fix conflicting parms turning off showEnd for full day events. (#2629)
## [2.18.0] - 2022-01-01 ## [2.18.0] - 2022-01-01

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

@ -329,8 +329,7 @@ Module.register("calendar", {
//subtract one second so that fullDayEvents end at 23:59:59, and not at 0:00:00 one the next day //subtract one second so that fullDayEvents end at 23:59:59, and not at 0:00:00 one the next day
event.endDate -= oneSecond; event.endDate -= oneSecond;
timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.fullDayEventDateFormat)); timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.fullDayEventDateFormat));
} } else if (this.config.getRelative > 0 && event.startDate < now) {
if (this.config.getRelative > 0 && event.startDate < now) {
// Ongoing and getRelative is set // Ongoing and getRelative is set
timeWrapper.innerHTML = this.capFirst( timeWrapper.innerHTML = this.capFirst(
this.translate("RUNNING", { this.translate("RUNNING", {