mirror of https://github.com/nextcloud/calendar
Merge pull request #5786 from nextcloud/fix/restore-event-reordering
fix: restore original event ordering
This commit is contained in:
commit
ffa02bded4
|
@ -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%',
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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', () => {
|
||||
|
|
Loading…
Reference in New Issue