@openui5/sap.ui.unified 1.120.7 → 1.121.0

package/.reuse/dep5

@@ -28,7 +28,7 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
 # OpenUI5 code
 
 Files: *
-Copyright: 2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+Copyright: 2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
 License: Apache-2.0
 
 
@@ -68,7 +68,7 @@ Comment: these files belong to: jQuery UI
 
 Files: src/sap.ui.commons/src/sap/ui/commons/Carousel.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Spencer Tipping
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jquery.fix.clone: Carousel.js is authored by SAP, but contains an improved implementation of the clone function which is taken from jquery-fix-clone
@@ -83,35 +83,35 @@ Comment: these files belong to: jQuery 3
 
 Files: src/sap.ui.core/src/sap/base/util/isPlainObject.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: isPlainObject.js is overall written by SAP, but contains a modified implementation of jQuery.isPlainObject taken from jQuery
 
 Files: src/sap.ui.core/src/sap/base/util/_merge.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: _merge.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/jquery.sap.script.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: jquery.sap.script.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/sap/ui/Device.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011, John Resig
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 1: Device.js is overall written by SAP, but contains code taken from jQuery 1.7.1 (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/Selectors.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.8: Selectors.js is overall written by SAP, but contains code taken from jQuery UI (see the respective comments)
@@ -123,14 +123,14 @@ Comment: these files belong to: jQuery UI 1.10
 
 Files: src/sap.ui.core/src/jquery.sap.dom.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.10: jquery.sap.dom.js is overall written by SAP, but contains code taken from jQuery UI Core (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/zIndex.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.11: zIndex.js is overall written by SAP, but contains an implementation of the function 'fnzIndex' which is taken from jQuery UI Datepicker 1.11.1
@@ -162,7 +162,7 @@ Comment: these files belong to: jQuery Mobile
 
 Files: src/sap.ui.core/src/sap/ui/util/_FeatureDetection.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2012 Wei-Ko Kao
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery.rtl-scroll-type: _FeatureDetection.js is overall written by SAP, but contains code which is inspired by jQuery.rtl-scroll-type
@@ -177,6 +177,13 @@ Copyright: jQuery Foundation and other contributors
 License: MIT
 Comment: these files belong to: JUnit Reporter for QUnit
 
+Files: src/sap.ui.core/src/sap/ui/qunit/qunit-junit.js
+Copyright:
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    jQuery Foundation and other contributors
+License: Apache-2.0 and MIT
+Comment: these files contain content from SAP and JUnit Reporter for QUnit: qunit-junit.js is overall written by SAP, but contains a modified copy of JUnit Reporter for QUnit (qunit-reporter-junit)
+
 Files: src/sap.ui.core/src/sap/ui/thirdparty/iscroll.js
 Copyright: 2012 Matteo Spinelli
 License: MIT
@@ -294,14 +301,14 @@ Comment: these files belong to: blanket.js
 
 Files: src/sap.ui.core/src/sap/base/util/JSTokenizer.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Douglas Crockford
 License: Apache-2.0 and LicenseRef-JSONinJSPublicDomain
 Comment: these files contain content from SAP and JSON in JS: JSTokenizer.js is overall written by SAP, but contains code has been taken from the component JSON in JavaScript (https://github.com/douglascrockford/JSON-js/blob/master/json2.js) from Douglas Crockford which is licensed under Public Domain
 
 Files: src/sap.ui.core/src/sap/ui/base/ExpressionParser.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2010 Douglas Crockford
 License: Apache-2.0
 Comment: these files contain content from SAP and Top Down Operator Precedence: ExpressionParser.js is overall written by SAP, but contains code taken from or inspired by TDOP by Douglas Crockford (see the respective comment)
@@ -335,7 +342,7 @@ Comment: these files contain content from p-cancelable and @babel/helpers: _Canc
 
 Files: src/sap.ui.core/src/sap/ui/core/date/Persian.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Behrang Norouzinia
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and Jalaali JS: Persian.js is overall written by SAP, but the calculation is taken from jalaali-js
@@ -347,14 +354,14 @@ Comment: these files belong to: vkBeautify
 
 Files: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Isaac Z. Schlueter and Contributors
 License: Apache-2.0 and ISC
 Comment: these files contain content from SAP and node-lru-cache: LRUPersistentCache.js is overall written by SAP, but portions ('Least Recently Used' logic) are taken from the node-lru-cache project (see https://github.com/isaacs/node-lru-cache/blob/v2.7.3/README.md) and modified.
 
 Files: src/sap.ui.core/test/sap/ui/core/qunit/i18n/helper/_timezones.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Arthur David Olson, Paul Eggert and other contributors
 License: Apache-2.0 and LicenseRef-tzdata-PublicDomain
 Comment: these files contain content from SAP and Time Zone Database: _timezones.js is overall written by SAP, but the list of IANA timezone IDs is taken from the Timezone Database
@@ -362,11 +369,6 @@ Comment: these files contain content from SAP and Time Zone Database: _timezones
 
 # Library: sap.ui.documentation:
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
-Copyright: 2013 Ariya Hidayat and other contributors
-License: BSD-2-Clause
-Comment: these files belong to: Esprima
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -459,7 +461,7 @@ Comment: these files belong to: UI5 Web Components
 
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)

package/THIRDPARTY.txt

@@ -15,7 +15,7 @@ Contained in: src/sap.m/src/sap/m/_thirdparty/purify.js
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.31.1
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -124,6 +124,7 @@ Copyright: jQuery Foundation and other contributors
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-reporter-junit.js
+	src/sap.ui.core/src/sap/ui/qunit/qunit-junit.js
 
 Component: cubiq.org - iScroll, version: 4.2.5
 Copyright: 2012 Matteo Spinelli
@@ -179,7 +180,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/caja-html-sanitizer.js
 
-Component: Unicode Common Locale Data Repository, version: 43
+Component: Unicode Common Locale Data Repository, version: 44
 Copyright: 1991-2023 Unicode, Inc.
 License: Unicode-DFS-2015
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
@@ -334,7 +335,7 @@ License: ISC
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/ISC.txt
 Contained in: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 
-Component: Time Zone Database, version: 2023c
+Component: Time Zone Database, version: 2023d
 Copyright: Arthur David Olson, Paul Eggert and other contributors
 License: LicenseRef-tzdata-PublicDomain
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/LicenseRef-tzdata-PublicDomain.txt
@@ -343,13 +344,7 @@ Contained in: src/sap.ui.core/test/sap/ui/core/qunit/i18n/helper/_timezones.js
 
 Library: sap.ui.documentation:
 
-Component: Esprima, version: 1.2.2
-Copyright: 2013 Ariya Hidayat and other contributors
-License: BSD-2-Clause
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
-
-Component: highlight.js, version: 10.4.1
+Component: highlight.js, version: 11.9.0
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -466,7 +461,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.6.8
+Component: SAP Theming Base Content, version: 11.10.0
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -663,38 +658,6 @@ END of license: Apache-2.0
 =================================
 
 
-=================================
-BEGIN of license: BSD-2-Clause
-=================================
-
-Copyright (c) <year> <owner>. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=================================
-END of license: BSD-2-Clause
-=================================
-
-
 =================================
 BEGIN of license: BSD-3-Clause
 =================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.120.7",
+  "version": "1.121.0",
   "description": "OpenUI5 UI Library sap.ui.unified",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.120.7"
+    "@openui5/sap.ui.core": "1.121.0"
   }
 }

package/src/sap/ui/unified/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.120.7</version>
+  <version>1.121.0</version>
 
   <documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
 

package/src/sap/ui/unified/Calendar.js

@@ -5,9 +5,11 @@
  */
 //Provides control sap.ui.unified.Calendar.
 sap.ui.define([
+	"sap/base/i18n/Formatting",
+	"sap/base/i18n/Localization",
 	'sap/ui/core/CalendarType',
 	'sap/ui/core/Control',
-	'sap/ui/core/Core',
+	"sap/ui/core/Element",
 	'sap/ui/core/LocaleData',
 	'sap/ui/unified/calendar/CalendarUtils',
 	'sap/ui/unified/DateTypeRange',
@@ -29,12 +31,13 @@ sap.ui.define([
 	"sap/ui/dom/containsOrEquals",
 	"sap/base/util/deepEqual",
 	"sap/base/Log",
-	"sap/ui/core/Configuration",
 	"sap/ui/core/date/CalendarWeekNumbering"
 ], function(
+	Formatting,
+	Localization,
 	CalendarType,
 	Control,
-	oCore,
+	Element,
 	LocaleData,
 	CalendarUtils,
 	DateTypeRange,
@@ -56,7 +59,6 @@ sap.ui.define([
 	containsOrEquals,
 	deepEqual,
 	Log,
-	Configuration,
 	CalendarWeekNumbering
 ) {
 	"use strict";
@@ -76,7 +78,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -230,17 +232,44 @@ sap.ui.define([
 			selectedDates : {type : "sap.ui.unified.DateRange", multiple : true, singularName : "selectedDate"},
 
 			/**
-			 * Dates or date ranges with type, to visualize special days in the <code>Calendar</code>.
-			 * If one day is assigned to more than one Type, only the first one will be used.
+			 * Dates or date ranges with type, to visualize special days.
 			 *
 			 * To set a single date (instead of a range), set only the <code>startDate</code> property
-			 * of the {@link sap.ui.unified.DateRange} class.
+			 * of the {@link sap.ui.unified.DateTypeRange} class.
 			 *
-			 * <b>Note:</b> Keep in mind that the <code>NonWorking</code> type is for marking specific
-			 * dates or date ranges as non-working, where if you need a weekly-reccuring non-working days
+			 * <b>Note:</b> If you need a weekly-reccuring non-working days
 			 * (weekend), you should use the <code>nonWorkingDays</code> property. Both the non-working
 			 * days (from property) and dates (from aggregation) are visualized the same.
 			 *
+			 * <b>Note:</b> In case there are multiple <code>sap.ui.unified.DateTypeRange</code> instances given for a single date,
+			 * only the first <code>sap.ui.unified.DateTypeRange</code> instance will be used.
+			 * For example, using the following sample, the 1st of November will be displayed as a working day of type "Type10":
+			 *
+			 *
+			 *	<pre>
+			 *	new DateTypeRange({
+			 *		startDate: UI5Date.getInstance(2023, 10, 1),
+			 *		type: CalendarDayType.Type10,
+			 *	}),
+			 *	new DateTypeRange({
+			 *		startDate: UI5Date.getInstance(2023, 10, 1),
+			 *		type: CalendarDayType.NonWorking
+			 *	})
+			 *	</pre>
+			 *
+			 * If you want the first of November to be displayed as a non-working day and also as "Type10," the following should be done:
+			 *	<pre>
+			 *	new DateTypeRange({
+			 *		startDate: UI5Date.getInstance(2023, 10, 1),
+			 *		type: CalendarDayType.Type10,
+			 *		secondaryType: CalendarDayType.NonWorking
+			 *	})
+			 *	</pre>
+			 *
+			 * You can use only one of the following types for a given date: <code>sap.ui.unified.CalendarDayType.NonWorking</code>,
+			 * <code>sap.ui.unified.CalendarDayType.Working</code> or <code>sap.ui.unified.CalendarDayType.None</code>.
+			 * Assigning more than one of these values in combination for the same date will lead to unpredictable results.
+			 *
 			 * @since 1.24.0
 			 */
 			specialDates : {type : "sap.ui.unified.DateTypeRange", multiple : true, singularName : "specialDate"},
@@ -703,7 +732,7 @@ sap.ui.define([
 	Calendar.prototype.getLocale = function(){
 
 		if (!this._sLocale) {
-			this._sLocale = Configuration.getFormatSettings().getFormatLocale().toString();
+			this._sLocale = new Locale(Formatting.getLanguageTag()).toString();
 		}
 
 		return this._sLocale;
@@ -912,7 +941,7 @@ sap.ui.define([
 	};
 
 	Calendar.prototype._getPrimaryCalendarType = function(){
-		return this.getProperty("primaryCalendarType") || Configuration.getCalendarType();
+		return this.getProperty("primaryCalendarType") || Formatting.getCalendarType();
 	};
 
 	/**
@@ -1298,7 +1327,7 @@ sap.ui.define([
 
 	Calendar.prototype._updateLegendParent = function(){
 		var sLegend = this.getLegend(),
-			oLegend = oCore.byId(sLegend);
+			oLegend = Element.getElementById(sLegend);
 
 		oLegend && oLegend._setParent(this);
 	};
@@ -2396,8 +2425,8 @@ sap.ui.define([
 	 */
 	Calendar.prototype._toggleTwoMonthsInTwoColumnsCSS = function () {
 		if (this._isTwoMonthsInTwoColumns()) {
-			if (oCore.getConfiguration().getLocale().getLanguage().toLowerCase() === "ja" ||
-				oCore.getConfiguration().getLocale().getLanguage().toLowerCase() === "zh") {
+			if (new Locale(Localization.getLanguageTag()).getLanguage().toLowerCase() === "ja" ||
+				new Locale(Localization.getLanguageTag()).getLanguage().toLowerCase() === "zh") {
 				this.addStyleClass("sapUiCalTwoMonthsTwoColumnsJaZh");
 				this.removeStyleClass("sapUiCalTwoMonthsTwoColumns");
 			} else {
@@ -2489,8 +2518,13 @@ sap.ui.define([
 
 	Calendar.prototype._adjustYearRangeDisplay = function() {
 		var oYearRangePicker = this.getAggregation("yearRangePicker"),
-			sLang = sap.ui.getCore().getConfiguration().getLanguage().toLocaleLowerCase(),
-			sPrimaryCalendarType = this._getPrimaryCalendarType();
+			sLang = Localization.getLanguage().toLocaleLowerCase(),
+			sPrimaryCalendarType = this._getPrimaryCalendarType(),
+			sSecondaryCalendarType = this._getSecondaryCalendarType(),
+			bKorean = sLang == "ko" || sLang == "ko-kr",
+			bJapaneseCalendar = sPrimaryCalendarType === CalendarType.Japanese || sSecondaryCalendarType === CalendarType.Japanese,
+			bGregorianCalendar = sPrimaryCalendarType === CalendarType.Gregorian
+				&& (sSecondaryCalendarType === CalendarType.Gregorian || !sSecondaryCalendarType);
 
 		if (!this._getSucessorsPickerPopup()) {
 			// An evaluation about the count of year cells that could fit in the sap.ui.unified.calendar.YearRangePicker
@@ -2498,13 +2532,13 @@ sap.ui.define([
 			// Based on those two criteria a couple of groups with different year cells count would be indicated and we
 			// could cover those scenarios with visual tests afterwards. Currently only the scenario with korean language
 			// is covered.
-			if (sPrimaryCalendarType == CalendarType.Japanese) {
+			if (bJapaneseCalendar) {
 				oYearRangePicker.setColumns(1);
 				oYearRangePicker.setYears(4);
-			} else if (sLang == "ko" || sLang == "ko-kr" || sPrimaryCalendarType != CalendarType.Gregorian) {
+			} else if (bKorean || !bGregorianCalendar) {
 				oYearRangePicker.setColumns(2);
 				oYearRangePicker.setYears(8);
-			} else if (sPrimaryCalendarType == CalendarType.Gregorian) {
+			} else if (bGregorianCalendar) {
 				oYearRangePicker.setColumns(3);
 				oYearRangePicker.setYears(9);
 			}

package/src/sap/ui/unified/CalendarAppointment.js

@@ -7,6 +7,9 @@
 // Provides control sap.ui.unified.CalendarAppointment.
 sap.ui.define([
 	'./DateTypeRange',
+	"sap/base/i18n/Formatting",
+	"sap/ui/core/Lib",
+	"sap/ui/core/Locale",
 	'sap/ui/core/format/DateFormat',
 	'sap/ui/core/format/NumberFormat',
 	'sap/ui/core/format/TimezoneUtil',
@@ -14,11 +17,13 @@ sap.ui.define([
 	'./calendar/CalendarUtils',
 	'./library',
 	"sap/base/Log",
-	"sap/ui/core/Configuration",
 	"sap/ui/core/date/UI5Date"
 ],
 	function(
 		DateTypeRange,
+		Formatting,
+		Library,
+		Locale,
 		DateFormat,
 		NumberFormat,
 		TimezoneUtil,
@@ -26,9 +31,8 @@ sap.ui.define([
 		CalendarUtils,
 		library,
 		Log,
-		Configuration,
 		UI5Date
-		) {
+	) {
 	"use strict";
 
 	/**
@@ -43,7 +47,7 @@ sap.ui.define([
 	 *
 	 * Applications could inherit from this element to add own fields.
 	 * @extends sap.ui.unified.DateTypeRange
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -116,7 +120,6 @@ sap.ui.define([
 			 * </ul>
 			 *
 			 * @since 1.93.0
-			 * @experimental Since 1.93, providing only limited functionality. Also, the API might be changed in the future.
 			 */
 			customContent: { type: "sap.ui.core.Control", multiple: true }
 		}
@@ -153,13 +156,13 @@ sap.ui.define([
 			oCurrentDayStart = UI5Date.getInstance(oCurrentlyDisplayedDate.getFullYear(), oCurrentlyDisplayedDate.getMonth(), oCurrentlyDisplayedDate.getDate(), 0, 0, 0),
 			oNextDayStart = UI5Date.getInstance(oCurrentDayStart.getFullYear(), oCurrentDayStart.getMonth(), oCurrentDayStart.getDate() + 1),
 			oTimeFormat = DateFormat.getTimeInstance({pattern: "HH:mm"}),
-			oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m"),
+			oResourceBundle = Library.getResourceBundleFor("sap.m"),
 			oHourFormat = NumberFormat.getUnitInstance({
 				allowedUnits: ["duration-hour"]
-			}, Configuration.getFormatSettings().getFormatLocale()),
+			}, new Locale(Formatting.getLanguageTag())),
 			oMinuteFormat = NumberFormat.getUnitInstance({
 				allowedUnits: ["duration-minute"]
-			}, Configuration.getFormatSettings().getFormatLocale()),
+			}, new Locale(Formatting.getLanguageTag())),
 			iHour, iMinute, sHour, sMinute;
 
 		//have no intersection with the given day
@@ -251,11 +254,15 @@ sap.ui.define([
 	 * @private
 	 */
 	CalendarAppointment.prototype._getCSSColorForBackground = function(sHex) {
+		if (sHex.length === 4) {
+			// normalize shortened hex values (#abc -> #aabbcc) in order to work properly with them
+			sHex = '#' + sHex.charAt(1) + sHex.charAt(1) + sHex.charAt(2) + sHex.charAt(2) + sHex.charAt(3) + sHex.charAt(3);
+		}
 		return "rgba(" + [
 				parseInt(sHex.substr(1, 2), 16), // Red
 				parseInt(sHex.substr(3, 2), 16), // Green
 				parseInt(sHex.substr(5, 2), 16) // Blue
-			].join(",") + ", 0.2)";
+			].join(", ") + ", 0.2)";
 	};
 
 	CalendarAppointment.prototype._setAppointmentPartSuffix = function (sSuffix) {

package/src/sap/ui/unified/CalendarDateInterval.js

@@ -14,12 +14,12 @@ sap.ui.define([
 	'./calendar/YearRangePicker',
 	'./calendar/CalendarDate',
 	'./library',
+	"sap/base/i18n/Localization",
 	'sap/ui/Device',
 	"./CalendarDateIntervalRenderer",
 	"sap/base/util/deepEqual",
 	"sap/m/Popover",
 	"sap/ui/core/CalendarType",
-	"sap/ui/core/Core",
 	"sap/base/Log",
 	"./DateRange",
 	"sap/ui/core/date/UI5Date"
@@ -33,12 +33,12 @@ sap.ui.define([
 	YearRangePicker,
 	CalendarDate,
 	library,
+	Localization,
 	Device,
 	CalendarDateIntervalRenderer,
 	deepEqual,
 	Popover,
 	CalendarType,
-	Core,
 	Log,
 	DateRange,
     UI5Date
@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @class
 	 * <code>CalendarDateInterval</code> only visualizes the dates in a one-line interval and allows the selection of a single day.
 	 * @extends sap.ui.unified.Calendar
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -1042,7 +1042,7 @@ sap.ui.define([
 			var $Popover = this._oPopup.$();
 			var iOffsetX = Math.floor(($Popover.width() - $Button.width()) / 2);
 
-			this._oPopup.setOffsetX(Core.getConfiguration().getRTL() ? iOffsetX : -iOffsetX);
+			this._oPopup.setOffsetX(Localization.getRTL() ? iOffsetX : -iOffsetX);
 
 			var iOffsetY = $Button.height();
 

package/src/sap/ui/unified/CalendarLegend.js

@@ -10,17 +10,18 @@ sap.ui.define([
 	'./library',
 	'./CalendarLegendRenderer',
 	"sap/base/Log",
+	"sap/ui/core/Element",
+	"sap/ui/core/Lib",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/unified/CalendarLegendItem",
-	"sap/ui/core/Core",
 	"sap/ui/Device",
 	"sap/ui/core/delegate/ItemNavigation"
 ],
-	function(Control, library, CalendarLegendRenderer, Log, jQuery, CalendarLegendItem, Core, Device, ItemNavigation) {
+	function(Control, library, CalendarLegendRenderer, Log, Element, Library, jQuery, CalendarLegendItem, Device, ItemNavigation) {
 	"use strict";
 
 	// Resource Bundle
-	var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.unified");
+	var oResourceBundle = Library.getResourceBundleFor("sap.ui.unified");
 
 	// shortcut for sap.ui.unified.CalendarDayType
 	var CalendarDayType = library.CalendarDayType;
@@ -56,7 +57,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -189,7 +190,7 @@ sap.ui.define([
 	CalendarLegend.prototype._onItemNavigationAfterFocus = function(oEvent) {
 		var oSource = oEvent.getSource(),
 			oLegendItemDomRef = oSource.getItemDomRefs()[oSource.getFocusedIndex()],
-			sType = Core.byId(oLegendItemDomRef.id).getType(),
+			sType = Element.getElementById(oLegendItemDomRef.id).getType(),
 			oParent = this._getParent();
 
 		this._setSpecialDateTypeFilter(sType);
@@ -344,6 +345,7 @@ sap.ui.define([
 
 		delete oFreeTypes[CalendarDayType.None];
 		delete oFreeTypes[CalendarDayType.NonWorking];
+		delete oFreeTypes[CalendarDayType.Working];
 
 		//remove types that are used
 		for (i = 0; i < aItems.length; i++) {

package/src/sap/ui/unified/CalendarLegendItem.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @class
 	 * Item to be displayed in a CalendarLegend.
 	 * @extends sap.ui.core.Element
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public