From cdd87436be348b31bd67ecd4851a7cc39e29320e Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Sun, 27 Mar 2022 09:16:25 -0500 Subject: [PATCH] fix fullday/showend conflict #2629 --- CHANGELOG.md | 1 + modules/default/calendar/calendar.js | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3493d2211e..3064817a98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ _This release is scheduled to be released on 2022-04-01._ - Fix minor console output issue for loading translations (#2814). - Don't adjust startDate for full day events if endDate is in the past - 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 diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 4c3a26f552..4a003daa93 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -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 event.endDate -= oneSecond; timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.fullDayEventDateFormat)); - } - if (this.config.getRelative > 0 && event.startDate < now) { + } else if (this.config.getRelative > 0 && event.startDate < now) { // Ongoing and getRelative is set timeWrapper.innerHTML = this.capFirst( this.translate("RUNNING", {