fix: restore original event ordering

The underlying issue has been fixed upstream.

This reverts:
- c5b5f162e0 (#4431)
- 5334250382 (#4646)

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
This commit is contained in:
Richard Steinmetz 2024-02-21 10:28:42 +01:00
parent 155e54d9f2
commit ded1f294eb
No known key found for this signature in database
GPG Key ID: 27137D9E7D273FB2
3 changed files with 1 additions and 6 deletions

View File

@ -128,8 +128,7 @@ export default {
dayHeaderDidMount,
eventDidMount,
noEventsDidMount,
// FIXME: remove title if upstream is fixed (https://github.com/fullcalendar/fullcalendar/issues/6608#issuecomment-954241059)
eventOrder: (this.$route.params.view === 'timeGridWeek' ? ['title'] : []).concat(['start', '-duration', 'allDay', eventOrder]),
eventOrder: ['start', '-duration', 'allDay', eventOrder],
forceEventDuration: false,
headerToolbar: false,
height: '100%',

View File

@ -41,11 +41,9 @@ export default function(firstEvent, secondEvent) {
return (firstEvent.extendedProps.calendarId < secondEvent.extendedProps.calendarId) ? -1 : 1
}
/* FIXME: uncomment this if upstream is fixed (https://github.com/fullcalendar/fullcalendar/issues/6608#issuecomment-954241059)
if (firstEvent.title !== secondEvent.title) {
return (firstEvent.title < secondEvent.title) ? -1 : 1
}
*/
return 0
}

View File

@ -107,10 +107,8 @@ describe('fullcalendar/eventOrder test suite', () => {
title: 'Title 456',
}
/* FIXME: uncomment if upstream is fixed (https://github.com/fullcalendar/fullcalendar/issues/6608#issuecomment-954241059)
expect(eventOrder(firstEvent, secondEvent)).toEqual(-1)
expect(eventOrder(secondEvent, firstEvent)).toEqual(1)
*/
})
it('should return zero if all properties are equal', () => {