@openui5/sap.ui.core 1.105.1 → 1.107.0

package/src/sap/ui/core/UIComponent.js

@@ -54,10 +54,9 @@ sap.ui.define([
 	 * @extends sap.ui.core.Component
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @alias sap.ui.core.UIComponent
 	 * @since 1.9.2
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var UIComponent = Component.extend("sap.ui.core.UIComponent", /** @lends sap.ui.core.UIComponent.prototype */
 
@@ -601,7 +600,7 @@ sap.ui.define([
 	 * Returns an element by its ID in the context of the component.
 	 *
 	 * @param {string} sId Component local ID of the element
-	 * @return {sap.ui.core.Element} element by its ID or <code>undefined</code>
+	 * @return {sap.ui.core.Element|undefined} element by its ID or <code>undefined</code>
 	 * @public
 	 */
 	UIComponent.prototype.byId = function(sId) {
@@ -629,7 +628,7 @@ sap.ui.define([
 	 * <code>null</code> if the ID does not contain a prefix.
 	 *
 	 * @param {string} sId Prefixed ID
-	 * @return {string} ID without prefix or <code>null</code>
+	 * @return {string|null} ID without prefix or <code>null</code>
 	 * @public
 	 * @since 1.39.0
 	 */

package/src/sap/ui/core/UIComponentMetadata.js

@@ -18,7 +18,7 @@ sap.ui.define(['./ComponentMetadata', 'sap/ui/core/mvc/ViewType'],
 	 * @experimental Since 1.15.1. The Component concept is still under construction, so some implementation details can be changed in future.
 	 * @class
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @since 1.15.1
 	 * @alias sap.ui.core.UIComponentMetadata
 	 * @extends sap.ui.core.ComponentMetadata

package/src/sap/ui/core/ValueStateSupport.js

@@ -16,7 +16,7 @@ sap.ui.define(['./Element', './library', "sap/base/assert"],
 		 * Helper functionality for value state support.
 		 *
 		 * @author SAP SE
-		 * @version 1.105.1
+		 * @version 1.107.0
 		 * @public
 		 * @namespace sap.ui.core.ValueStateSupport
 		 */
@@ -70,7 +70,7 @@ sap.ui.define(['./Element', './library', "sap/base/assert"],
 		 * represents one of these states.
 		 *
 		 * @param {sap.ui.core.Element|sap.ui.core.ValueState} vValue the Element of which the valueState needs to be checked, or the ValueState explicitly
-		 * @returns {string} the success/warning/error text, if appropriate; otherwise null
+		 * @returns {string|null} the success/warning/error text, if appropriate; otherwise null
 		 *
 		 * @public
 		 * @name sap.ui.core.ValueStateSupport.getAdditionalText

package/src/sap/ui/core/VariantLayoutData.js

@@ -20,12 +20,11 @@ sap.ui.define(['./LayoutData', './library'],
 	 * @class
 	 * Allows to add multiple LayoutData to one control in case that an easy switch of layouts (e.g. in a Form) is needed.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @public
 	 * @since 1.9.2
 	 * @alias sap.ui.core.VariantLayoutData
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var VariantLayoutData = LayoutData.extend("sap.ui.core.VariantLayoutData", /** @lends sap.ui.core.VariantLayoutData.prototype */ { metadata : {
 

package/src/sap/ui/core/XMLComposite.js

@@ -146,7 +146,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.105.1
+		 * @version 1.107.0
 		 * @since 1.56.0
 		 * @alias sap.ui.core.XMLComposite
 		 * @see {@link topic:b83a4dcb7d0e46969027345b8d32fd44 XML Composite Controls}
@@ -231,7 +231,7 @@ sap.ui.define([
 		 * May only be used by the implementation of a specific XMLComposite, not by an application using a XMLComposite.
 		 *
 		 * @param {string} sId XMLComposite-local ID of the inner element
-		 * @returns {sap.ui.core.Element} element by its ID or <code>undefined</code>
+		 * @returns {sap.ui.core.Element|undefined} element by its ID or <code>undefined</code>
 		 * @protected
 		 */
 		XMLComposite.prototype.byId = function (sId) {

package/src/sap/ui/core/XMLCompositeMetadata.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @param {object} oClassInfo static info to construct the metadata from
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @since 1.50.0
 	 * @alias sap.ui.core.XMLCompositeMetadata
 	 * @extends sap.ui.core.ElementMetadata

package/src/sap/ui/core/XMLTemplateProcessor.js

@@ -8,7 +8,7 @@
 
 sap.ui.define([
 	'sap/ui/base/DataType',
-	'sap/ui/base/ManagedObject',
+	'sap/ui/base/BindingInfo',
 	'sap/ui/core/CustomData',
 	'sap/ui/core/Component',
 	'./mvc/View',
@@ -25,11 +25,12 @@ sap.ui.define([
 	'sap/base/util/LoaderExtensions',
 	'sap/base/util/JSTokenizer',
 	'sap/base/util/each',
-	'sap/base/util/isEmptyObject'
+	'sap/base/util/isEmptyObject',
+	'sap/ui/core/Configuration'
 ],
 function(
 	DataType,
-	ManagedObject,
+	BindingInfo,
 	CustomData,
 	Component,
 	View,
@@ -46,13 +47,14 @@ function(
 	LoaderExtensions,
 	JSTokenizer,
 	each,
-	isEmptyObject
+	isEmptyObject,
+	Configuration
 ) {
 	"use strict";
 
 	function parseScalarType(sType, sValue, sName, oContext, oRequireModules) {
 		// check for a binding expression (string)
-		var oBindingInfo = ManagedObject.bindingParser(sValue, oContext, /*bUnescape*/true,
+		var oBindingInfo = BindingInfo.parse(sValue, oContext, /*bUnescape*/true,
 			/*bTolerateFunctionsNotFound*/false, /*bStaticContext*/false, /*bPreferContext*/false,
 			oRequireModules);
 
@@ -80,7 +82,7 @@ function(
 		}
 
 		// Note: to avoid double resolution of binding expressions, we have to escape string values once again
-		return typeof vValue === "string" ? ManagedObject.bindingParser.escape(vValue) : vValue;
+		return typeof vValue === "string" ? BindingInfo.escape(vValue) : vValue;
 	}
 
 	function localName(xmlNode) {
@@ -585,7 +587,7 @@ function(
 		Log.debug("XML processing mode is " + (oView._sProcessingMode || "default") + ".", "", "XMLTemplateProcessor");
 		Log.debug("XML will be processed " + (bAsync ? "asynchronously" : "synchronously") + ".", "", "XMLTemplateProcessor");
 
-		var bDesignMode = sap.ui.getCore().getConfiguration().getDesignMode();
+		var bDesignMode = Configuration.getDesignMode();
 		if (bDesignMode) {
 			oView._sapui_declarativeSourceInfo = {
 				// the node representing the current control
@@ -1183,7 +1185,7 @@ function(
 
 						} else if ((sName === "binding" && !oInfo) || sName === 'objectBindings' ) {
 							if (!bStashedControl) {
-								var oBindingInfo = ManagedObject.bindingParser(sValue, oView._oContainingView.oController);
+								var oBindingInfo = BindingInfo.parse(sValue, oView._oContainingView.oController);
 								// TODO reject complex bindings, types, formatters; enable 'parameters'?
 								if (oBindingInfo) {
 									mSettings.objectBindings = mSettings.objectBindings || {};
@@ -1255,7 +1257,7 @@ function(
 
 						} else if (oInfo && oInfo._iKind === 2 /* MULTIPLE_AGGREGATION */ ) {
 							if (!bStashedControl) {
-								var oBindingInfo = ManagedObject.bindingParser(sValue, oView._oContainingView.oController, false, false, false, false, oRequireModules);
+								var oBindingInfo = BindingInfo.parse(sValue, oView._oContainingView.oController, false, false, false, false, oRequireModules);
 								if ( oBindingInfo ) {
 									mSettings[sName] = oBindingInfo;
 								} else {
@@ -1758,7 +1760,7 @@ function(
 	XMLTemplateProcessor._calculatedModelMapping = function(sBinding, oContext, bAllowMultipleBindings) {
 		var oCtx,
 			mBinding = {},
-			oBinding = ManagedObject.bindingParser(sBinding, oContext);
+			oBinding = BindingInfo.parse(sBinding, oContext);
 
 		function checkFormatter(aFragments) {
 			// the pattern must be /d,/d,/d

package/src/sap/ui/core/_ConfigurationProvider.js

@@ -0,0 +1,187 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/base/Log",
+	"sap/base/util/syncFetch"
+], function (Log, syncFetch) {
+	"use strict";
+
+	/*
+	 * Merged, raw (un-interpreted) configuration data from the following sources
+	 * (last one wins)
+	 * <ol>
+	 * <li>global configuration object <code>window["sap-ui-config"]</code> (could be either a string/url or a configuration object)</li>
+	 * <li><code>data-sap-ui-config</code> attribute of the bootstrap script tag</li>
+	 * <li>other <code>data-sap-ui-<i>xyz</i></code> attributes of the bootstrap tag</li>
+	 * </ol>
+	 */
+	var oCfgData = window["sap-ui-config"] = (function() {
+		function normalize(o) {
+			for (var i in o) {
+				var v = o[i];
+				var il = i.toLowerCase();
+				if ( !o.hasOwnProperty(il) ) {
+					o[il] = v;
+					delete o[i];
+				}
+			}
+			return o;
+		}
+
+		function loadExternalConfig(url) {
+			var sCfgFile = "sap-ui-config.json",
+				config;
+
+			Log.warning("Loading external bootstrap configuration from \"" + url + "\". This is a design time feature and not for productive usage!");
+			if (url !== sCfgFile) {
+				Log.warning("The external bootstrap configuration file should be named \"" + sCfgFile + "\"!");
+			}
+
+			try {
+				var oSimpleResponse = syncFetch(url, {
+					headers: {
+						Accept: syncFetch.ContentTypes.JSON
+					}
+				});
+				if (oSimpleResponse.ok) {
+					try {
+						config = oSimpleResponse.json();
+					} catch (error) {
+						Log.error("Parsing externalized bootstrap configuration from \"" + url + "\" failed! Reason: " + error + "!");
+					}
+				} else {
+					Log.error("Loading externalized bootstrap configuration from \"" + url + "\" failed! Response: " + oSimpleResponse.status + "!");
+				}
+			} catch (error) {
+				Log.error("Loading externalized bootstrap configuration from \"" + url + "\" failed! Reason: " + error + "!");
+			}
+
+			config = config || {};
+			config.__loaded = true; // mark config as 'being loaded', needed to detect sync call
+
+			return config;
+		}
+
+		function getInfo() {
+			function check(oScript, rUrlPattern) {
+				var sUrl = oScript && oScript.getAttribute("src");
+				var oMatch = rUrlPattern.exec(sUrl);
+				if ( oMatch ) {
+					return {
+						tag: oScript,
+						url: sUrl,
+						resourceRoot: oMatch[1] || ""
+					};
+				}
+			}
+
+			var rResources = /^((?:.*\/)?resources\/)/,
+				rBootScripts, aScripts, i, oResult;
+
+			// Prefer script tags which have the sap-ui-bootstrap ID
+			// This prevents issues when multiple script tags point to files named
+			// "sap-ui-core.js", for example when using the cache buster for UI5 resources
+			oResult = check(document.querySelector('SCRIPT[src][id=sap-ui-bootstrap]'), rResources);
+
+			if ( !oResult ) {
+				aScripts = document.querySelectorAll('SCRIPT[src]');
+				rBootScripts = /^([^?#]*\/)?(?:sap-ui-(?:core|custom|boot|merged)(?:-[^?#/]*)?|jquery.sap.global|ui5loader(?:-autoconfig)?)\.js(?:[?#]|$)/;
+				for ( i = 0; i < aScripts.length; i++ ) {
+					oResult = check(aScripts[i], rBootScripts);
+					if ( oResult ) {
+						break;
+					}
+				}
+			}
+
+			return oResult || {};
+		}
+
+		var _oBootstrap = getInfo(),
+			oScriptTag = _oBootstrap.tag,
+			oCfg = window["sap-ui-config"];
+
+		// load the configuration from an external JSON file
+		if (typeof oCfg === "string") {
+			oCfg = loadExternalConfig(oCfg);
+		}
+		oCfg = normalize(oCfg || {});
+		oCfg.resourceroots = oCfg.resourceroots || {};
+		oCfg.themeroots = oCfg.themeroots || {};
+
+		// if a script tag has been identified, collect its configuration info
+		if ( oScriptTag ) {
+			// evaluate the config attribute first - if present
+			var sConfig = oScriptTag.getAttribute("data-sap-ui-config");
+			if ( sConfig ) {
+				try {
+					var oParsedConfig;
+					try {
+						// first try to parse the config as a plain JSON
+						oParsedConfig = JSON.parse("{" + sConfig + "}");
+					} catch (e) {
+						// if the JSON.parse fails, we fall back to the more lenient "new Function" eval for compatibility reasons
+						Log.error("JSON.parse on the data-sap-ui-config attribute failed. Please check the config for JSON syntax violations.");
+						/*eslint-disable no-new-func */
+						oParsedConfig = (new Function("return {" + sConfig + "};"))();
+						/*eslint-enable no-new-func */
+					}
+					Object.assign(oCfg, normalize(oParsedConfig));
+				} catch (e) {
+					// no log yet, how to report this error?
+					Log.error("failed to parse data-sap-ui-config attribute: " + (e.message || e));
+				}
+			}
+
+			// merge with any existing "data-sap-ui-" attributes
+			for (var i = 0; i < oScriptTag.attributes.length; i++) {
+				var attr = oScriptTag.attributes[i];
+				var m = attr.name.match(/^data-sap-ui-(.*)$/);
+				if ( m ) {
+					// the following (deactivated) conversion would implement multi-word names like "resource-roots"
+					m = m[1].toLowerCase(); // .replace(/\-([a-z])/g, function(s,w) { return w.toUpperCase(); })
+					if ( m === 'resourceroots' ) {
+						// merge map entries instead of overwriting map
+						Object.assign(oCfg[m], JSON.parse(attr.value));
+					} else if ( m === 'theme-roots' ) {
+						// merge map entries, but rename to camelCase
+						Object.assign(oCfg.themeroots, JSON.parse(attr.value));
+					} else if ( m !== 'config' ) {
+						oCfg[m] = attr.value;
+					}
+				}
+			}
+		}
+
+		return oCfg;
+	}());
+
+	// evaluate configuration
+	oCfgData.loglevel = (function() {
+		var m = /(?:\?|&)sap-ui-log(?:L|-l)evel=([^&]*)/.exec(window.location.search);
+		return m && m[1];
+	}()) || oCfgData.loglevel;
+	if ( oCfgData.loglevel ) {
+		Log.setLevel(Log.Level[oCfgData.loglevel.toUpperCase()] || parseInt(oCfgData.loglevel));
+	} else if (!window["sap-ui-optimized"]) {
+		Log.setLevel(Log.Level.DEBUG);
+	}
+
+	function ui5ToRJS(sName) {
+		if ( /^jquery\.sap\./.test(sName) ) {
+			return sName;
+		}
+		return sName.replace(/\./g, "/");
+	}
+
+	// take resource roots from configuration
+	var paths = {};
+	for ( var n in oCfgData["resourceroots"] ) {
+		paths[ui5ToRJS(n)] = oCfgData["resourceroots"][n] || ".";
+	}
+	sap.ui.loader.config({paths: paths});
+});

package/src/sap/ui/core/cache/CacheManager.js

@@ -10,9 +10,10 @@ sap.ui.define([
 	'sap/ui/Device',
 	"sap/base/Log",
 	"sap/ui/performance/Measurement",
-	'sap/ui/performance/trace/Interaction'
+	'sap/ui/performance/trace/Interaction',
+	"sap/ui/core/Configuration"
 ],
-	function(LRUPersistentCache, CacheManagerNOP, Device, Log, Measurement, Interaction) {
+	function(LRUPersistentCache, CacheManagerNOP, Device, Log, Measurement, Interaction, Configuration) {
 		"use strict";
 
 		/**
@@ -144,11 +145,11 @@ sap.ui.define([
 			/**
 			 * Retrieves a value for given key.
 			 * @param key the key to retrieve a value for
-			 * @returns {Promise} a promise that would be resolved in case of successful operation or rejected with
+			 * @returns {Promise<any|undefined>} a promise that would be resolved in case of successful operation or rejected with
 			 * value of the error message if the operation fails. It resolves with a value that is either:
 			 * <ul>
 			 *  <li>undefined - the entry does not exist</li>
-			 *  <li>any other - the entry exists and value contains the actually one</li>
+			 *  <li>any other - the entry exists and value contains the actual one</li>
 			 * </ul>
 			 * @public
 			 */
@@ -277,7 +278,7 @@ sap.ui.define([
 				var that = this;
 				return Promise.resolve().then(function () {
 					safeClearInstance(that);
-					sap.ui.getCore().getConfiguration().setUI5CacheOn(false);
+					Configuration.setUI5CacheOn(false);
 				});
 			},
 
@@ -290,10 +291,10 @@ sap.ui.define([
 			_switchOn: function () {
 				var that = this;
 				return Promise.resolve().then(function () {
-					var oCfg = sap.ui.getCore().getConfiguration();
+					var oCfg = Configuration;
 					if (!oCfg.isUI5CacheOn()) {
 						safeClearInstance(that);
-						sap.ui.getCore().getConfiguration().setUI5CacheOn(true);
+						Configuration.setUI5CacheOn(true);
 					}
 					return Promise.resolve();
 				});
@@ -391,7 +392,7 @@ sap.ui.define([
 			iMsrCounter = 0;
 
 		function isSwitchedOn() {
-			return sap.ui.getCore().getConfiguration().isUI5CacheOn();
+			return Configuration.isUI5CacheOn();
 		}
 
 		function safeClearInstance(cm) {

package/src/sap/ui/core/cache/LRUPersistentCache.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["sap/base/Log", "sap/ui/performance/Measurement", "sap/ui/Global"],
-	function(Log, Measurement, Global) {
+sap.ui.define(["sap/base/Log", "sap/ui/performance/Measurement", "sap/ui/Global", "sap/ui/core/Configuration"],
+	function(Log, Measurement, Global, Configuration) {
 		"use strict";
 
 		/**
@@ -926,11 +926,11 @@ sap.ui.define(["sap/base/Log", "sap/ui/performance/Measurement", "sap/ui/Global"
 		}
 
 		function isSerializationSupportOn() {
-			return sap.ui.getCore().getConfiguration().isUI5CacheSerializationSupportOn();
+			return Configuration.isUI5CacheSerializationSupportOn();
 		}
 
 		function getExcludedKeys() {
-			return sap.ui.getCore().getConfiguration().getUI5CacheExcludedKeys();
+			return Configuration.getUI5CacheExcludedKeys();
 		}
 
 		/**

package/src/sap/ui/core/cldr/es_BO.json

@@ -1107,9 +1107,9 @@
 				"yMd": "d/M/y",
 				"yMEd": "E d/M/y",
 				"yMM": "M/y",
-				"yMMM": "MMMM 'de' y",
-				"yMMMd": "d 'de' MMMM 'de' y",
-				"yMMMEd": "E, d 'de' MMM 'de' y",
+				"yMMM": "MMM y",
+				"yMMMd": "d MMM y",
+				"yMMMEd": "E, d MMM y",
 				"yMMMM": "MMMM 'de' y",
 				"yMMMMd": "d 'de' MMMM 'de' y",
 				"yMMMMEd": "EEE, d 'de' MMMM 'de' y",

package/src/sap/ui/core/cldr/es_CL.json

@@ -1107,9 +1107,9 @@
 				"yMd": "dd-MM-y",
 				"yMEd": "E dd-MM-y",
 				"yMM": "M/y",
-				"yMMM": "MMMM 'de' y",
-				"yMMMd": "d 'de' MMMM 'de' y",
-				"yMMMEd": "E, d 'de' MMM 'de' y",
+				"yMMM": "MMM y",
+				"yMMMd": "d MMM y",
+				"yMMMEd": "E, d MMM y",
 				"yMMMM": "MMMM 'de' y",
 				"yMMMMd": "d 'de' MMMM 'de' y",
 				"yMMMMEd": "EEE, d 'de' MMMM 'de' y",

package/src/sap/ui/core/cldr/es_MX.json

@@ -1107,9 +1107,9 @@
 				"yMd": "d/M/y",
 				"yMEd": "E, d/M/y",
 				"yMM": "MM/y",
-				"yMMM": "MMMM 'de' y",
-				"yMMMd": "d 'de' MMMM 'de' y",
-				"yMMMEd": "EEE, d 'de' MMMM 'de' y",
+				"yMMM": "MMM y",
+				"yMMMd": "d MMM y",
+				"yMMMEd": "EEE, d 'de' MMM 'de' y",
 				"yMMMM": "MMMM 'de' y",
 				"yMMMMd": "d 'de' MMMM 'de' y",
 				"yMMMMEd": "EEE, d 'de' MMMM 'de' y",

package/src/sap/ui/core/cldr/es_PE.json

@@ -1107,9 +1107,9 @@
 				"yMd": "d/M/y",
 				"yMEd": "E d/M/y",
 				"yMM": "M/y",
-				"yMMM": "MMMM 'de' y",
-				"yMMMd": "d 'de' MMMM 'de' y",
-				"yMMMEd": "E, d 'de' MMM 'de' y",
+				"yMMM": "MMM y",
+				"yMMMd": "d MMM y",
+				"yMMMEd": "E, d MMM y",
 				"yMMMM": "MMMM 'de' y",
 				"yMMMMd": "d 'de' MMMM 'de' y",
 				"yMMMMEd": "EEE, d 'de' MMMM 'de' y",

package/src/sap/ui/core/cldr/es_UY.json

@@ -1107,9 +1107,9 @@
 				"yMd": "d/M/y",
 				"yMEd": "E d/M/y",
 				"yMM": "M/y",
-				"yMMM": "MMMM 'de' y",
-				"yMMMd": "d 'de' MMMM 'de' y",
-				"yMMMEd": "E, d 'de' MMM 'de' y",
+				"yMMM": "MMM y",
+				"yMMMd": "d MMM y",
+				"yMMMEd": "E, d MMM y",
 				"yMMMM": "MMMM 'de' y",
 				"yMMMMd": "d 'de' MMMM 'de' y",
 				"yMMMMEd": "EEE, d 'de' MMMM 'de' y",

package/src/sap/ui/core/cldr/es_VE.json

@@ -1107,9 +1107,9 @@
 				"yMd": "d/M/y",
 				"yMEd": "E d/M/y",
 				"yMM": "M/y",
-				"yMMM": "MMMM 'de' y",
+				"yMMM": "MMM y",
 				"yMMMd": "d MMM y",
-				"yMMMEd": "E, d 'de' MMM 'de' y",
+				"yMMMEd": "E, d MMM y",
 				"yMMMM": "MMMM 'de' y",
 				"yMMMMd": "d 'de' MMMM 'de' y",
 				"yMMMMEd": "EEE, d 'de' MMMM 'de' y",

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

@@ -5,8 +5,8 @@
  */
 
 // Provides class sap.ui.core.date.Islamic
-sap.ui.define(['./UniversalDate', '../CalendarType', 'sap/base/Log', './_Calendars'],
-	function(UniversalDate, CalendarType, Log, _Calendars) {
+sap.ui.define(['./UniversalDate', '../CalendarType', 'sap/base/Log', './_Calendars', 'sap/ui/core/Configuration'],
+	function(UniversalDate, CalendarType, Log, _Calendars, Configuration) {
 	"use strict";
 
 
@@ -212,9 +212,9 @@ sap.ui.define(['./UniversalDate', '../CalendarType', 'sap/base/Log', './_Calenda
 
 		oCustomizationMap = {};
 
-		sDateFormat = sap.ui.getCore().getConfiguration().getFormatSettings().getLegacyDateFormat();
+		sDateFormat = Configuration.getFormatSettings().getLegacyDateFormat();
 		sDateFormat = _isSupportedIslamicCalendarType(sDateFormat) ? sDateFormat : "A"; // set "A" as a fall-back format always
-		oCustomizationJSON = sap.ui.getCore().getConfiguration().getFormatSettings().getLegacyDateCalendarCustomizing();
+		oCustomizationJSON = Configuration.getFormatSettings().getLegacyDateCalendarCustomizing();
 		oCustomizationJSON = oCustomizationJSON || [];
 
 

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

@@ -5,8 +5,8 @@
  */
 
 // 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/LocaleData', './_Calendars', 'sap/ui/core/Configuration'],
+	function(BaseObject, LocaleData, _Calendars, Configuration) {
 	"use strict";
 
 
@@ -81,7 +81,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
 		}
 
 		if (!sCalendarType) {
-			sCalendarType = sap.ui.getCore().getConfiguration().getCalendarType();
+			sCalendarType = Configuration.getCalendarType();
 		}
 		clDate = UniversalDate.getClass(sCalendarType);
 		oInstance = Object.create(clDate.prototype);
@@ -99,7 +99,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
 	 */
 	UniversalDate.getClass = function(sCalendarType) {
 		if (!sCalendarType) {
-			sCalendarType = sap.ui.getCore().getConfiguration().getCalendarType();
+			sCalendarType = Configuration.getCalendarType();
 		}
 		return _Calendars.get(sCalendarType);
 	};
@@ -271,7 +271,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
 	 * @private
 	 */
 	UniversalDate.getWeekByDate = function(sCalendarType, iYear, iMonth, iDay, oLocale, oWeekConfig) {
-		oLocale = oLocale || sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+		oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
 		var oLocaleData = LocaleData.getInstance(oLocale);
 		var clDate = this.getClass(sCalendarType);
 		var oFirstDay = getFirstDayOfFirstWeek(clDate, iYear, oLocale, oWeekConfig);
@@ -320,7 +320,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
 	 * @private
 	 */
 	UniversalDate.getFirstDateOfWeek = function(sCalendarType, iYear, iWeek, oLocale, oWeekConfig) {
-		oLocale = oLocale || sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+		oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
 		var oLocaleData = LocaleData.getInstance(oLocale);
 		var clDate = this.getClass(sCalendarType);
 		var oFirstDay = getFirstDayOfFirstWeek(clDate, iYear, oLocale, oWeekConfig);
@@ -367,7 +367,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
 	 * @private
 	 */
 	function getFirstDayOfFirstWeek(clDate, iYear, oLocale, oWeekConfig) {
-		oLocale = oLocale || sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+		oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
 		var oLocaleData = LocaleData.getInstance(oLocale);
 		var iMinDays;
 		var iFirstDayOfWeek;
@@ -438,7 +438,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/LocaleData', './_Calendars'],
 	};
 
 	function getEras(sCalendarType) {
-		var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale(),
+		var oLocale = Configuration.getFormatSettings().getFormatLocale(),
 			oLocaleData = LocaleData.getInstance(oLocale),
 			aEras = mEras[sCalendarType];
 		if (!aEras) {

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

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['sap/ui/core/date/UniversalDate', 'sap/ui/core/Locale', 'sap/ui/core/LocaleData', 'sap/base/assert'],
-	function (UniversalDate, Locale, LocaleData, assert) {
+sap.ui.define(['sap/ui/core/date/UniversalDate', 'sap/ui/core/Locale', 'sap/ui/core/LocaleData', 'sap/base/assert', 'sap/ui/core/Configuration'],
+	function (UniversalDate, Locale, LocaleData, assert, Configuration) {
 		"use strict";
 
 		function clone(oUniversalDate) {
@@ -178,7 +178,7 @@ sap.ui.define(['sap/ui/core/date/UniversalDate', 'sap/ui/core/Locale', 'sap/ui/c
 		 */
 		UniversalDateUtils.getWeekStartDate = function (oUniversalDate, sLocale) {
 			var oLocale = sLocale ? new Locale(sLocale)
-					: sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale(),
+					: Configuration.getFormatSettings().getFormatLocale(),
 				oLocaleData = LocaleData.getInstance(oLocale),
 				iFirstDayOfWeek = oLocaleData.getFirstDayOfWeek();
 			oUniversalDate = oUniversalDate ? clone(oUniversalDate) : clone(UniversalDateUtils.createNewUniversalDate());