Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ba76437f authored by Georg Ehrke's avatar Georg Ehrke
Browse files

Adapt our handlers / plugins to FC 5

parent 3a076313
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@
			"clover"
		],
		"transformIgnorePatterns": [
			"/node_modules/(?!calendar-js).+\\.js$"
			"/node_modules/(?!(calendar-js)|(@fullcalendar)).+\\.js$"
		],
		"setupFilesAfterEnv": [
			"./tests/javascript/jest.setup.js",
+3 −3
Original line number Diff line number Diff line
@@ -24,15 +24,15 @@
 * Returns weekend days for a locale
 *
 * @param {String} locale The locale to get weekend days for
 * @returns {[string, string]}
 * @returns {Number[]}
 */
export const getWeekendDaysForLocale = (locale) => {
	switch (locale) {
	case 'he':
	case 'he_IL':
		return ['fri', 'sat']
		return [5, 6]

	default:
		return ['sat', 'sun']
		return [0, 6]
	}
}
+8 −11
Original line number Diff line number Diff line
@@ -26,19 +26,16 @@ import { getWeekendDaysForLocale } from '../localization/localeWeekendProvider.j
 * Adds weekend classes to the day cell
 *
 * @param {Object} data The destructuring object
 * @param {Element} el The DOM element of the day cell
 * @param {Date} data.date The date object representing the dayCell
 * @returns {String[]} Array of classnames
 */
export default function({ el }) {
export default function({ date }) {
	const locale = getLocale()
	const fcClasses = getWeekendDaysForLocale(locale)
		.map((dayOfWeekend) => 'fc-' + dayOfWeekend)
	const daysOfWeekend = getWeekendDaysForLocale(locale)

	for (const fcClass of fcClasses) {
		if (el.classList.contains(fcClass)) {
			el.classList.add('nc-calendar-fc-day-of-weekend')
			return
	if (daysOfWeekend.includes(date.getDay())) {
		return ['nc-calendar-fc-day-of-weekend']
	} else {
		return ['nc-calendar-fc-day-of-workweek']
	}
}

	el.classList.add('nc-calendar-fc-day-of-workweek')
}
+4 −4
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ import getTimezoneManager from '../../../../../src/services/timezoneDataProvider
import { getUnixTimestampFromDate } from '../../../../../src/utils/date.js'
import { eventSourceFunction } from '../../../../../src/fullcalendar/eventSources/eventSourceFunction.js'

jest.mock('../../../../src/utils/color.js')
jest.mock('../../../../src/services/timezoneDataProviderService')
jest.mock('../../../../src/utils/date.js')
jest.mock('../../../../src/fullcalendar/eventSourceFunction.js')
jest.mock('../../../../../src/utils/color.js')
jest.mock('../../../../../src/services/timezoneDataProviderService')
jest.mock('../../../../../src/utils/date.js')
jest.mock('../../../../../src/fullcalendar/eventSources/eventSourceFunction.js')

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

Loading