diff --git a/public/js/components/Tempus/Tempus.js b/public/js/components/Tempus/Tempus.js index 168e89058..935210c72 100644 --- a/public/js/components/Tempus/Tempus.js +++ b/public/js/components/Tempus/Tempus.js @@ -1301,7 +1301,7 @@ export default { :mode="currentMode" :parkedEvents="parkedKeys" :visible-lecturers="visibleLecturerUids" - :cacheMultiplier="currentMode === 'week' ? 0 : 0" + :cacheMultiplier="currentMode === 'week' ? 1 : 0" @drop="dropHandler" @resize="resizeHandler" @update:date="handleChangeDate" diff --git a/public/js/composables/Tempus/TempusEventLoader.js b/public/js/composables/Tempus/TempusEventLoader.js index 75d87985c..ea0d1a1c6 100644 --- a/public/js/composables/Tempus/TempusEventLoader.js +++ b/public/js/composables/Tempus/TempusEventLoader.js @@ -18,6 +18,12 @@ export function useEventLoader( let currentlyDisplayedDateRange; + const getCachePadding = () => { + const cacheSize = Math.max(Vue.toValue(cacheMultiplier), 0); + + return Math.round(currentlyDisplayedDateRange.length() * cacheSize) + 1; + }; + const reload = () => { if ( currentlyDisplayedDateRange && @@ -144,10 +150,7 @@ export function useEventLoader( cachedEventsEndTimestamp = modifiedRequestEndTimestamp; } - const cacheSize = Math.max(Vue.toValue(cacheMultiplier), 0); - const cachePadding = Math.round( - currentlyDisplayedDateRange.length() * cacheSize, - ); + const cachePadding = getCachePadding(); allowedCacheStartTimestamp = startTimestamp - cachePadding; allowedCacheEndTimestamp = endTimestamp + cachePadding; @@ -190,11 +193,6 @@ export function useEventLoader( allowedCacheStartTimestamp, allowedCacheEndTimestamp, ) => { - const cacheSize = Math.max(Vue.toValue(cacheMultiplier), 0); - const cachePadding = Math.round( - currentlyDisplayedDateRange.length() * cacheSize, - ); - if ( cachedEventsStartTimestamp < allowedCacheEndTimestamp && cachedEventsEndTimestamp > allowedCacheStartTimestamp