From 727eb0cfd77100a9d9c87429137d459f79a1b037 Mon Sep 17 00:00:00 2001 From: Matt Bauer Date: Tue, 14 May 2019 09:53:34 -0500 Subject: [PATCH] Calendar: only slice multi-day events when they actually span midnight --- modules/default/calendar/calendar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 1b1fbc51..2eac086e 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -493,11 +493,11 @@ Module.register("calendar", { /* if sliceMultiDayEvents is set to true, multiday events (events exceeding at least one midnight) are sliced into days, * otherwise, esp. in dateheaders mode it is not clear how long these events are. */ - if (this.config.sliceMultiDayEvents) { + var maxCount = Math.ceil(((event.endDate - 1) - moment(event.startDate, "x").endOf("day").format("x"))/(1000*60*60*24)) + 1; + if (this.config.sliceMultiDayEvents && maxCount > 1) { var splitEvents = []; var midnight = moment(event.startDate, "x").clone().startOf("day").add(1, "day").format("x"); var count = 1; - var maxCount = Math.ceil(((event.endDate - 1) - moment(event.startDate, "x").endOf("day").format("x"))/(1000*60*60*24)) + 1; while (event.endDate > midnight) { var thisEvent = JSON.parse(JSON.stringify(event)) // clone object thisEvent.today = thisEvent.startDate >= today && thisEvent.startDate < (today + 24 * 60 * 60 * 1000);