From ded1f294eb40f7299167fcb12c8d6cb63387c9bb Mon Sep 17 00:00:00 2001
From: Richard Steinmetz <richard@steinmetz.cloud>
Date: Wed, 21 Feb 2024 10:28:42 +0100
Subject: [PATCH] fix: restore original event ordering

The underlying issue has been fixed upstream.

This reverts:
- c5b5f162e0ec5adae9bb57dcf75dfbbaba00afc0 (#4431)
- 5334250382703499a1c832f23a50cd321d712d8a (#4646)

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
---
 src/components/CalendarGrid.vue                                | 3 +--
 src/fullcalendar/rendering/eventOrder.js                       | 2 --
 .../javascript/unit/fullcalendar/rendering/eventOrder.test.js  | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/CalendarGrid.vue b/src/components/CalendarGrid.vue
index fe632d4ba..9ead61ff9 100644
--- a/src/components/CalendarGrid.vue
+++ b/src/components/CalendarGrid.vue
@@ -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%',
diff --git a/src/fullcalendar/rendering/eventOrder.js b/src/fullcalendar/rendering/eventOrder.js
index e26609ac4..a7234245d 100644
--- a/src/fullcalendar/rendering/eventOrder.js
+++ b/src/fullcalendar/rendering/eventOrder.js
@@ -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
 }
diff --git a/tests/javascript/unit/fullcalendar/rendering/eventOrder.test.js b/tests/javascript/unit/fullcalendar/rendering/eventOrder.test.js
index eb5d2e72d..8bc79d52f 100644
--- a/tests/javascript/unit/fullcalendar/rendering/eventOrder.test.js
+++ b/tests/javascript/unit/fullcalendar/rendering/eventOrder.test.js
@@ -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', () => {