@openui5/sap.ui.core 1.96.12 → 1.96.13

package/src/sap/ui/core/date/CalendarUtils.js

@@ -0,0 +1,92 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Provides type sap.ui.core.date.CalendarUtils.
+sap.ui.define([
+	"sap/ui/core/date/CalendarWeekNumbering",
+	"sap/ui/core/LocaleData"
+], function(
+	CalendarWeekNumbering,
+	LocaleData
+) {
+	"use strict";
+
+	var mWeekNumberingConfiguration = {
+			ISO_8601 : {
+				firstDayOfWeek : 1,
+				minimalDaysInFirstWeek : 4
+			},
+			MiddleEastern : {
+				firstDayOfWeek : 6,
+				minimalDaysInFirstWeek : 1
+			},
+			WesternTraditional : {
+				firstDayOfWeek : 0,
+				minimalDaysInFirstWeek : 1
+			}
+		};
+
+	/**
+	 * Provides calendar-related utilities.
+	 *
+	 * Note: This API has been introduced with version 1.108 and downported to this release with
+	 * patch level 15.
+	 *
+	 * @namespace
+	 * @alias module:sap/ui/core/date/CalendarUtils
+	 * @public
+	 * @since 1.96.15
+	 */
+	var CalendarUtils = {
+
+		/**
+		 * Resolves calendar week configuration.
+		 *
+		 * Returns an object with the following fields:
+		 * <ul>
+		 *   <li><code>firstDayOfWeek</code>: specifies the first day of the week starting with
+		 *   <code>0</code> (which is Sunday)</li>
+		 *   <li><code>minimalDaysInFirstWeek</code>: minimal days at the beginning of the year
+		 *   which define the first calendar week</li>
+		 * </ul>
+		 *
+		 * Note: This API has been introduced with version 1.108 and downported to this release with
+		 * patch level 15.
+		 *
+		 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering=Default]
+		 *   The calendar week numbering; if omitted, <code>Default</code> is used.
+		 * @param {sap.ui.core.Locale} [oLocale]
+		 *   The locale to use; if not provided, this falls back to the format locale from the
+		 *   Configuration; see {@link sap.ui.core.Configuration.FormatSettings#getFormatLocale}.
+		 *   Is only used when <code>sCalendarWeekNumbering</code> is set to <code>Default</code>.
+		 * @returns {{firstDayOfWeek: int, minimalDaysInFirstWeek: int}|undefined}
+		 *   The calendar week configuration, or <code>undefined<code> for an invalid value of
+		 *   <code>sap.ui.core.date.CalendarWeekNumbering</code>.
+		 * @public
+		 * @since 1.96.15
+		 */
+		getWeekConfigurationValues : function (sCalendarWeekNumbering, oLocale) {
+			var oLocaleData;
+
+			if (mWeekNumberingConfiguration.hasOwnProperty(sCalendarWeekNumbering)) {
+				return mWeekNumberingConfiguration[sCalendarWeekNumbering];
+			}
+			sCalendarWeekNumbering = sCalendarWeekNumbering || CalendarWeekNumbering.Default;
+			if (sCalendarWeekNumbering === CalendarWeekNumbering.Default) {
+				oLocale = oLocale ||
+					sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+				oLocaleData = LocaleData.getInstance(oLocale);
+				return {
+					firstDayOfWeek : oLocaleData.getFirstDayOfWeek(),
+					minimalDaysInFirstWeek : oLocaleData.getMinimalDaysInFirstWeek()
+				};
+			}
+			return undefined;
+		}
+	};
+
+	return CalendarUtils;
+});

package/src/sap/ui/core/date/CalendarWeekNumbering.js

@@ -0,0 +1,76 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Provides type sap.ui.core.date.CalendarWeekNumbering.
+sap.ui.define([], function() {
+	"use strict";
+
+	/**
+	 * The <code>CalendarWeekNumbering</code> enum defines how to calculate calendar weeks. Each
+	 * value defines:
+	 * <ul>
+	 * <li>The first day of the week,</li>
+	 * <li>the first week of the year.</li>
+	 * </ul>
+	 *
+	 * Note: This API has been introduced with version 1.108 and downported to this release with
+	 * patch level 15.
+	 *
+	 * @enum {string}
+	 * @public
+	 * @since 1.96.15
+	 * @alias sap.ui.core.date.CalendarWeekNumbering
+	 */
+	var CalendarWeekNumbering = {
+
+		/**
+		 * The default calendar week numbering:
+		 *
+		 * The framework determines the week numbering scheme; currently it is derived from the
+		 * active format locale. Future versions of UI5 might select a different week numbering
+		 * scheme.
+		 *
+		 * @public
+		 */
+		Default : "Default",
+
+		/**
+		 * Official calendar week numbering in most of Europe (ISO 8601 standard):
+		 * <ul>
+		 * <li>Monday is first day of the week,
+		 * <li>the week containing January 4th is first week of the year.
+		 * </ul>
+		 *
+		 * @public
+		 */
+		ISO_8601 : "ISO_8601",
+
+		/**
+		 * Official calendar week numbering in much of the Middle East (Middle Eastern calendar):
+		 * <ul>
+		 * <li>Saturday is first day of the week,
+		 * <li>the week containing January 1st is first week of the year.
+		 * </ul>
+		 *
+		 * @public
+		 */
+		MiddleEastern : "MiddleEastern",
+
+		/**
+		 * Official calendar week numbering in the United States, Canada, Brazil, Israel, Japan, and
+		 * other countries (Western traditional calendar):
+		 * <ul>
+		 * <li>Sunday is first day of the week,
+		 * <li>the week containing January 1st is first week of the year.
+		 * </ul>
+		 *
+		 * @public
+		 */
+		WesternTraditional : "WesternTraditional"
+	};
+
+	return CalendarWeekNumbering;
+}, /* bExport= */ true);

package/src/sap/ui/core/date/Japanese.js

@@ -230,11 +230,49 @@ sap.ui.define(['./UniversalDate', '../CalendarType', './_Calendars'],
 		}
 		return this._setUTCJapanese(oJapanese);
 	};
-	Japanese.prototype.getWeek = function() {
-		return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getFullYear(), this.getMonth(), this.getDate());
+
+	/**
+	 * Retrieves the calendar week
+	 *
+	 * @param {sap.ui.core.Locale} [oLocale] the locale used to get the calendar week calculation
+	 *   properties, defaults to the formatLocale
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering, the default is derived from <code>oLocale</code> but this
+	 *   parameter has precedence over oLocale if both are provided. If calendar week numbering is
+	 *   not determined from the locale then {@link LocaleData#firstDayStartsFirstWeek} is ignored.
+	 * @returns {{week: int, year: int}} resulting calendar week, note: week index starts with
+	 *   <code>0</code>, the year is the Gregorian year
+	 * @private
+	 * @throws {TypeError} If <code>sCalendarWeekNumbering</code> has an invalid week numbering
+	 *   value
+	 */
+	Japanese.prototype.getWeek = function(oLocale, sCalendarWeekNumbering) {
+		// use the full year of the Gregorian date (this.oDate) because the Japanese constructor is
+		// able to calculate the era and emperor year from it.
+		return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getFullYear(),
+			this.getMonth(), this.getDate(), oLocale, sCalendarWeekNumbering);
 	};
-	Japanese.prototype.getUTCWeek = function() {
-		return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate());
+
+	/**
+	 * Retrieves the UTC calendar week
+	 *
+	 * @param {sap.ui.core.Locale} [oLocale] the locale used to get the calendar week calculation
+	 *   properties, defaults to the formatLocale
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering, the default is derived from <code>oLocale</code> but this
+	 *   parameter has precedence over oLocale if both are provided. If calendar week numbering is
+	 *   not determined from the locale then {@link LocaleData#firstDayStartsFirstWeek} is ignored.
+	 * @returns {{week: int, year: int}} resulting calendar week, note: week index starts with
+	 *   <code>0</code>, the year is the Gregorian year
+	 * @private
+	 * @throws {TypeError} If <code>sCalendarWeekNumbering</code> has an invalid week numbering
+	 *   value
+	 */
+	Japanese.prototype.getUTCWeek = function(oLocale, sCalendarWeekNumbering) {
+		// use the full year of the Gregorian date (this.oDate) because the Japanese constructor is
+		// able to calculate the era and emperor year from it.
+		return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getUTCFullYear(),
+			this.getUTCMonth(), this.getUTCDate(), oLocale, sCalendarWeekNumbering);
 	};
 
 	_Calendars.set(CalendarType.Japanese, Japanese);

package/src/sap/ui/core/date/UniversalDate.js

@@ -5,8 +5,21 @@
  */
 
 // Provides class sap.ui.core.date.UniversalDate
-sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
-	function(BaseObject, LocaleData, _Calendars) {
+sap.ui.define([
+	'sap/ui/base/Object',
+	'sap/ui/core/Locale',
+	'sap/ui/core/LocaleData',
+	'./_Calendars',
+	'./CalendarUtils',
+	'./CalendarWeekNumbering'
+], function(
+	BaseObject,
+	Locale,
+	LocaleData,
+	_Calendars,
+	CalendarUtils,
+	CalendarWeekNumbering
+) {
 	"use strict";
 
 
@@ -148,18 +161,76 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
 	UniversalDate.prototype.setUTCEra = function(iEra) {
 		// The default implementation does not support setting the era
 	};
-	UniversalDate.prototype.getWeek = function() {
-		return UniversalDate.getWeekByDate(this.sCalendarType, this.getFullYear(), this.getMonth(), this.getDate());
+
+	/**
+	 * Retrieves the calendar week
+	 *
+	 * @param {sap.ui.core.Locale} [oLocale] the locale used to get the calendar week calculation properties, defaults to the formatLocale
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering,
+	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
+	 *   If calendar week numbering is not determined from the locale then {@link LocaleData#firstDayStartsFirstWeek} is ignored.
+	 * @returns {{week: int, year: int}} resulting calendar week, note: week index starts with <code>0</code>
+	 * @private
+	 * @throws {TypeError} If <code>sCalendarWeekNumbering</code> has an invalid week numbering value
+	 */
+	UniversalDate.prototype.getWeek = function(oLocale, sCalendarWeekNumbering) {
+		checkWeekConfig(sCalendarWeekNumbering);
+		return UniversalDate.getWeekByDate(this.sCalendarType, this.getFullYear(), this.getMonth(), this.getDate(), oLocale, sCalendarWeekNumbering);
 	};
-	UniversalDate.prototype.setWeek = function(oWeek) {
-		var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week);
+
+	/**
+	 * Sets the calendar week
+	 *
+	 * @param {{week: int, year: int}} oWeek the calendar week, note: week index starts with <code>0</code>,
+	 *   <code>oWeek.year</code> is optional and defaults to {@link sap.ui.core.date.UniversalDate#getFullYear}
+	 * @param {sap.ui.core.Locale} [oLocale] the locale used to get the calendar week calculation properties, defaults to the formatLocale
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering,
+	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
+	 *   If calendar week numbering is not determined from the locale then {@link LocaleData#firstDayStartsFirstWeek} is ignored.
+	 * @private
+	 * @throws {TypeError} If <code>sCalendarWeekNumbering</code> has an invalid week numbering value
+	 */
+	UniversalDate.prototype.setWeek = function(oWeek, oLocale, sCalendarWeekNumbering) {
+		checkWeekConfig(sCalendarWeekNumbering);
+		var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week, oLocale, sCalendarWeekNumbering);
 		this.setFullYear(oDate.year, oDate.month, oDate.day);
 	};
-	UniversalDate.prototype.getUTCWeek = function() {
-		return UniversalDate.getWeekByDate(this.sCalendarType, this.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate());
+
+	/**
+	 * Retrieves the UTC calendar week
+	 *
+	 * @param {sap.ui.core.Locale} [oLocale] the locale used to get the calendar week calculation properties, defaults to the formatLocale
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering,
+	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
+	 *   If calendar week numbering is not determined from the locale then {@link LocaleData#firstDayStartsFirstWeek} is ignored.
+	 * @returns {{week: int, year: int}} resulting calendar week, note: week index starts with <code>0</code>
+	 * @private
+	 * @throws {TypeError} If <code>sCalendarWeekNumbering</code> has an invalid week numbering value
+	 */
+	UniversalDate.prototype.getUTCWeek = function(oLocale, sCalendarWeekNumbering) {
+		checkWeekConfig(sCalendarWeekNumbering);
+		return UniversalDate.getWeekByDate(this.sCalendarType, this.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate(), oLocale, sCalendarWeekNumbering);
 	};
-	UniversalDate.prototype.setUTCWeek = function(oWeek) {
-		var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week);
+
+	/**
+	 * Sets the UTC calendar week
+	 *
+	 * @param {{week: int, year: int}} oWeek the calendar week, note: week index starts with <code>0</code>,
+	 *   <code>oWeek.year</code> is optional and defaults to {@link sap.ui.core.date.UniversalDate#getFullYear}
+	 * @param {sap.ui.core.Locale} [oLocale] the locale used to get the calendar week calculation properties, defaults to the formatLocale
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering,
+	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
+	 *   If calendar week numbering is not determined from the locale then {@link LocaleData#firstDayStartsFirstWeek} is ignored.
+	 * @private
+	 * @throws {TypeError} If <code>sCalendarWeekNumbering</code> has an invalid week numbering value
+	 */
+	UniversalDate.prototype.setUTCWeek = function(oWeek, oLocale, sCalendarWeekNumbering) {
+		checkWeekConfig(sCalendarWeekNumbering);
+		var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week, oLocale, sCalendarWeekNumbering);
 		this.setUTCFullYear(oDate.year, oDate.month, oDate.day);
 	};
 	UniversalDate.prototype.getQuarter = function() {
@@ -202,22 +273,38 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
 	 */
 	var iMillisecondsInWeek = 7 * 24 * 60 * 60 * 1000;
 
-	UniversalDate.getWeekByDate = function(sCalendarType, iYear, iMonth, iDay) {
-		var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale(),
-			oLocaleData = LocaleData.getInstance(oLocale),
-			clDate = this.getClass(sCalendarType),
-			oFirstDay = getFirstDayOfFirstWeek(clDate, iYear),
-			oDate = new clDate(clDate.UTC(iYear, iMonth, iDay)),
-			iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
-		// If region is US, always calculate the week for the current year, otherwise
-		// the week might be the last week of the previous year or first week of next year
-		if (oLocaleData.firstDayStartsFirstWeek()) {
+	/**
+	 * Retrieves the calendar week for a given date, specified by year, month, and day.
+	 *
+	 * @param {string} sCalendarType the calendar type, e.g. <code>"Gregorian"</code>
+	 * @param {int} iYear year, e.g. <code>2016</code>
+	 * @param {int} iMonth the month, e.g. <code>2</code>
+	 * @param {int} iDay the date, e.g. <code>3</code>
+	 * @param {sap.ui.core.Locale} [oLocale] the locale used for the week calculation, if oWeekConfig is not provided (falls back to the formatLocale)
+	 *   e.g. <code>new Locale("de-DE")</code>
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering,
+	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
+	 *   If calendar week numbering is not determined from the locale then {@link LocaleData#firstDayStartsFirstWeek} is ignored.
+	 * @returns {{week: int, year: int}} resulting calendar week, note: week index starts with <code>0</code>, e.g. <code>{year: 2016, week: 8}</code>
+	 * @private
+	 * @throws {TypeError} If <code>sCalendarWeekNumbering</code> has an invalid week numbering value
+	 */
+	UniversalDate.getWeekByDate = function(sCalendarType, iYear, iMonth, iDay, oLocale, sCalendarWeekNumbering) {
+		checkWeekConfig(sCalendarWeekNumbering);
+		oLocale = oLocale || sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+		var clDate = this.getClass(sCalendarType);
+		var oFirstDay = getFirstDayOfFirstWeek(clDate, iYear, oLocale, sCalendarWeekNumbering);
+		var oDate = new clDate(clDate.UTC(iYear, iMonth, iDay));
+		var iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
+		var bSplitWeek = isSplitWeek(sCalendarWeekNumbering, oLocale);
+		if (bSplitWeek) {
 			iWeek = calculateWeeks(oFirstDay, oDate);
 		} else {
 			iLastYear = iYear - 1;
 			iNextYear = iYear + 1;
-			oLastFirstDay = getFirstDayOfFirstWeek(clDate, iLastYear);
-			oNextFirstDay = getFirstDayOfFirstWeek(clDate, iNextYear);
+			oLastFirstDay = getFirstDayOfFirstWeek(clDate, iLastYear, oLocale, sCalendarWeekNumbering);
+			oNextFirstDay = getFirstDayOfFirstWeek(clDate, iNextYear, oLocale, sCalendarWeekNumbering);
 			if (oDate >= oNextFirstDay) {
 				iYear = iNextYear;
 				iWeek = 0;
@@ -234,17 +321,30 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
 		};
 	};
 
-	UniversalDate.getFirstDateOfWeek = function(sCalendarType, iYear, iWeek) {
-		var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale(),
-			oLocaleData = LocaleData.getInstance(oLocale),
-			clDate = this.getClass(sCalendarType),
-			oFirstDay = getFirstDayOfFirstWeek(clDate, iYear),
-			oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek),
-			bIsRegionUS = oLocaleData.firstDayStartsFirstWeek();
-		//If first day of week is in last year and region is US, return the
-		//1st of January instead for symmetric behaviour
-
-		if (bIsRegionUS && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
+	/**
+	 * Retrieves the first day's date of the given week in the given year.
+	 *
+	 * @param {string} sCalendarType the calendar type, e.g. <code>"Gregorian"</code>
+	 * @param {int} iYear year, e.g. <code>2016</code>
+	 * @param {int} iWeek the calendar week index, e.g. <code>8</code>
+	 * @param {sap.ui.core.Locale} [oLocale] the locale used for the week calculation, if oWeekConfig is not provided (falls back to the formatLocale)
+	 *   e.g. <code>new Locale("de-DE")</code>
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering,
+	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
+	 *   If calendar week numbering is not determined from the locale then {@link LocaleData#firstDayStartsFirstWeek} is ignored.
+	 * @returns {{month: int, year: int, day: int}} the resulting date, e.g. <code>{year: 2016, month: 1, day: 29}</code>
+	 * @private
+	 * @throws {TypeError} If <code>sCalendarWeekNumbering</code> has an invalid week numbering value
+	 */
+	UniversalDate.getFirstDateOfWeek = function(sCalendarType, iYear, iWeek, oLocale, sCalendarWeekNumbering) {
+		checkWeekConfig(sCalendarWeekNumbering);
+		oLocale = oLocale || sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+		var clDate = this.getClass(sCalendarType);
+		var oFirstDay = getFirstDayOfFirstWeek(clDate, iYear, oLocale, sCalendarWeekNumbering);
+		var oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek);
+		var bSplitWeek = isSplitWeek(sCalendarWeekNumbering, oLocale);
+		if (bSplitWeek && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
 			return {
 				year: iYear,
 				month: 0,
@@ -258,13 +358,66 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
 		};
 	};
 
-	function getFirstDayOfFirstWeek(clDate, iYear) {
-		var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale(),
-			oLocaleData = LocaleData.getInstance(oLocale),
-			iMinDays = oLocaleData.getMinimalDaysInFirstWeek(),
-			iFirstDayOfWeek = oLocaleData.getFirstDayOfWeek(),
-			oFirstDay = new clDate(clDate.UTC(iYear, 0, 1)),
-			iDayCount = 7;
+	/**
+	 * Determines if the split week algorithm should be applied (the first day of the first calendar
+	 * week of the year is January 1st).
+	 *
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering
+	 * @param {sap.ui.core.Locale} [oLocale] the locale used for the week calculation
+	 * @returns {boolean} if the split week should be applied
+	 * @private
+	 */
+	function isSplitWeek(sCalendarWeekNumbering, oLocale) {
+		oLocale = oLocale || sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+		var oLocaleData = LocaleData.getInstance(oLocale);
+		return (!sCalendarWeekNumbering ||
+			sCalendarWeekNumbering === CalendarWeekNumbering.Default)
+			&& oLocaleData.firstDayStartsFirstWeek();
+	}
+
+	/**
+	 * Checks the calendar week configuration
+	 *
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering
+	 * @throws {TypeError} If <code>sCalendarWeekNumbering</code> has an invalid week numbering value
+	 * @private
+	 */
+	function checkWeekConfig(sCalendarWeekNumbering) {
+		if (sCalendarWeekNumbering && !Object.values(CalendarWeekNumbering).includes(sCalendarWeekNumbering)) {
+			throw new TypeError("Illegal format option calendarWeekNumbering: '" + sCalendarWeekNumbering + "'");
+		}
+	}
+
+	/**
+	 * Returns the first day of the first week in the given year.
+	 *
+	 * @param {UniversalDate} clDate the date class
+	 * @param {int} iYear year, e.g. <code>2016</code>
+	 * @param {sap.ui.core.Locale} [oLocale] the locale used for the week calculation, if oWeekConfig is not provided (falls back to the formatLocale)
+	 *   e.g. <code>new Locale("de-DE")</code>
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+	 *   calendar week numbering,
+	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
+	 * @returns {Date} first day of the first week in the given year, e.g. <code>Mon Jan 04 2016 01:00:00 GMT+0100</code>
+	 * @private
+	 */
+	function getFirstDayOfFirstWeek(clDate, iYear, oLocale, sCalendarWeekNumbering) {
+		oLocale = oLocale || sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+
+		var oWeekConfig = CalendarUtils.getWeekConfigurationValues(sCalendarWeekNumbering, oLocale);
+		var iMinDays = oWeekConfig.minimalDaysInFirstWeek;
+		var iFirstDayOfWeek = oWeekConfig.firstDayOfWeek;
+
+		var oFirstDay = new clDate(clDate.UTC(iYear, 0, 1));
+		var iDayCount = 7;
+
+		if (isNaN(oFirstDay.getTime())) {
+			throw new Error("Could not determine the first day of the week, because the date " +
+				"object is invalid");
+		}
+
 		// Find the first day of the first week of the year
 		while (oFirstDay.getUTCDay() !== iFirstDayOfWeek) {
 			oFirstDay.setUTCDate(oFirstDay.getUTCDate() - 1);

package/src/sap/ui/core/delegate/ItemNavigation.js

@@ -82,7 +82,7 @@ sap.ui.define([
 	 * @param {Element[]} aItemDomRefs Array of DOM references representing the items for the navigation
 	 * @param {boolean} [bNotInTabChain=false] Whether the selected element should be in the tab chain or not
 	 *
-	 * @version 1.96.12
+	 * @version 1.96.13
 	 * @alias sap.ui.core.delegate.ItemNavigation
 	 * @public
 	 */

package/src/sap/ui/core/delegate/ScrollEnablement.js

@@ -58,7 +58,7 @@ sap.ui.define([
 		 *
 		 * @protected
 		 * @alias sap.ui.core.delegate.ScrollEnablement
-		 * @version 1.96.12
+		 * @version 1.96.13
 		 * @author SAP SE
 		 */
 		var ScrollEnablement = BaseObject.extend("sap.ui.core.delegate.ScrollEnablement", /** @lends sap.ui.core.delegate.ScrollEnablement.prototype */ {

package/src/sap/ui/core/dnd/DragDropBase.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.96.12
+	 * @version 1.96.13
 	 *
 	 * @public
 	 * @since 1.52

package/src/sap/ui/core/dnd/DragDropInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(["./DragInfo", "./DropInfo", "sap/ui/Device", "sap/base/Log"],
 	 * @extends sap.ui.core.dnd.DropInfo
 	 *
 	 * @author SAP SE
-	 * @version 1.96.12
+	 * @version 1.96.13
 	 *
 	 * @public
 	 * @since 1.52

package/src/sap/ui/core/dnd/DragInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(["./DragDropBase"],
 	 * @extends sap.ui.core.dnd.DragDropBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.12
+	 * @version 1.96.13
 	 *
 	 * @public
 	 * @since 1.56

package/src/sap/ui/core/dnd/DropInfo.js

@@ -21,7 +21,7 @@ sap.ui.define(["./DragDropBase"],
 	 * @extends sap.ui.core.dnd.DragDropBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.12
+	 * @version 1.96.13
 	 *
 	 * @public
 	 * @since 1.56