Merge pull request #4433 from nextcloud/backport/4431/stable3.4 (4edf19f5) · Commits · e / infra / ecloud / nextcloud-apps / calendar

src/components/CalendarGrid.vue

+2 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,8 @@ export default {
		dayHeaderDidMount,
		eventDidMount,
		noEventsDidMount,
		eventOrder: ['start', '-duration', 'allDay', eventOrder],
		// FIXME: remove title if upstream is fixed (https://github.com/fullcalendar/fullcalendar/issues/6608#issuecomment-954241059)
		eventOrder: ['title', 'start', '-duration', 'allDay', eventOrder],
		forceEventDuration: false,
		headerToolbar: false,
		height: '100%',

+2 −0

Original line number	Diff line number	Diff line
		@@ -41,9 +41,11 @@ 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
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		* along with this program. If not, see <http://www.gnu.org/licenses/>.
		*
		*/
		import eventOrder from "../../../../../src/fullcalendar/rendering/eventOrder.js";
		import eventOrder from '../../../../../src/fullcalendar/rendering/eventOrder.js'

		describe('fullcalendar/eventOrder test suite', () => {

		@@ -107,8 +107,10 @@ 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', () => {