@openui5/sap.ui.core 1.103.1 → 1.106.0

package/src/jquery.sap.global.js

@@ -4,8 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-/*global XMLHttpRequest, localStorage, alert, document */
-
 /**
  * Provides base functionality of the SAP jQuery plugin as extension of the jQuery framework.<br/>
  * See also <a href="http://api.jquery.com/jQuery/">jQuery</a> for details.<br/>
@@ -33,6 +31,7 @@ sap.ui.define([
 
 	// former sap-ui-core.js dependencies
 	"sap/ui/Device",
+	"sap/ui/core/Configuration",
 
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/thirdparty/jqueryui/jquery-ui-position",
@@ -48,6 +47,7 @@ sap.ui.define([
 	syncXHRFix, LoaderExtensions,
 
 	Device,
+	Configuration,
 
 	jQuery /*, jqueryUiPosition, ui5loaderAutoconfig, jquerySapStubs, URI, PasteEventFix */) {
 	"use strict";
@@ -64,15 +64,6 @@ sap.ui.define([
 
 	var _ui5loader = ui5loader._;
 
-	// early logging support
-	var _earlyLogs = [];
-	function _earlyLog(sLevel, sMessage) {
-		_earlyLogs.push({
-			level: sLevel,
-			message: sMessage
-		});
-	}
-
 	var oJQVersion = Version(jQuery.fn.jquery);
 
 	(function() {
@@ -185,190 +176,33 @@ sap.ui.define([
 		syncXHRFix();
 	}
 
-	/*
-	 * 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 conffiguration 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 + "\"!");
-			}
-
-			var xhr = new XMLHttpRequest();
-			xhr.addEventListener('load', function(e) {
-				if ( xhr.status === 200 && xhr.responseText ) {
-					try {
-						config = JSON.parse( xhr.responseText );
-					} catch (error) {
-						Log.error("Parsing externalized bootstrap configuration from \"" + url + "\" failed! Reason: " + error + "!");
-					}
-				} else {
-					Log.error("Loading externalized bootstrap configuration from \"" + url + "\" failed! Response: " + xhr.status + "!");
-				}
-			});
-			xhr.open('GET', url, false);
-			try {
-				xhr.send();
-			} 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 || {};
-
-		// map loadall mode to sync preload mode
-		if ( /(^|\/)(sap-?ui5|[^\/]+-all).js([?#]|$)/.test(_oBootstrap.url) ) {
-			Log.error(
-				"The all-in-one file 'sap-ui-core-all.js' has been abandoned in favour of standard preloads." +
-				" Please migrate to sap-ui-core.js and consider to use async preloads.");
-			oCfg.preload = 'sync';
-		}
-
-		// 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;
-					}
-				}
-			}
+	// Normalize configuration to stay compatible
+	// Previously the sap/ui/core/_ConfigurationProvider code (incl. normalization)
+	// was executed here. Since we moved the coding to an own module which is
+	// a dependency of sap/ui/core/Configuration it's possible, that someone requires
+	// the configuration and normalizes the window['sap-ui-config'] object at an
+	// earlier point in time. To avoid, that someone adds configuration parameters
+	// to the window object inbetween normalization done by _ConfigurationProvider
+	// and the usage within jquery.sap.global we normalize here again.
+	var oCfg = window["sap-ui-config"];
+	for (var sKey in oCfg) {
+		var vValue = oCfg[sKey];
+		var sLowerCaseKey = sKey.toLowerCase();
+		if ( !oCfg.hasOwnProperty(sLowerCaseKey) ) {
+			oCfg[sLowerCaseKey] = vValue;
+			delete oCfg[sKey];
 		}
-
-		return oCfg;
-	}());
-
-	var syncCallBehavior = 0; // ignore
-	if ( oCfgData['xx-nosync'] === 'warn' || /(?:\?|&)sap-ui-xx-nosync=(?:warn)/.exec(window.location.search) ) {
-		syncCallBehavior = 1;
-	}
-	if ( oCfgData['xx-nosync'] === true || oCfgData['xx-nosync'] === 'true' || /(?:\?|&)sap-ui-xx-nosync=(?:x|X|true)/.exec(window.location.search) ) {
-		syncCallBehavior = 2;
-	}
-
-	ui5loader.config({
-		reportSyncCalls: syncCallBehavior
-	});
-
-	if ( syncCallBehavior && oCfgData.__loaded ) {
-		_earlyLog(syncCallBehavior === 1 ? "warning" : "error", "[nosync]: configuration loaded via sync XHR");
 	}
 
 	// check whether noConflict must be used...
-	if ( oCfgData.noconflict === true || oCfgData.noconflict === "true"  || oCfgData.noconflict === "x" ) {
+	if ( Configuration.getValue("noConflict") ) {
 		jQuery.noConflict();
 	}
 
 	/**
 	 * Root Namespace for the jQuery plug-in provided by SAP SE.
 	 *
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @namespace
 	 * @public
 	 * @static
@@ -958,24 +792,6 @@ sap.ui.define([
 		}
 	};
 
-	// 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);
-	}
-
-	Log.info("SAP Logger started.");
-	// log early logs
-	jQuery.each(_earlyLogs, function(i,e) {
-		Log[e.level](e.message);
-	});
-	_earlyLogs = null;
-
 	// ------------------------------------------- OBJECT --------------------------------------------------------
 
 	/**
@@ -1091,7 +907,7 @@ sap.ui.define([
 			iEndCreate = isNaN(iNoCreates) ? 0 : l - iNoCreates,
 			i;
 
-		if ( syncCallBehavior && oContext === window ) {
+		if ( Configuration.getSyncCallBehavior() && oContext === window ) {
 			Log.error("[nosync] getObject called to retrieve global name '" + sName + "'");
 		}
 
@@ -1490,7 +1306,7 @@ sap.ui.define([
 		 * @private
 		 */
 		var oLog = _ui5loader.logger = Log.getLogger("sap.ui.ModuleSystem",
-				(/sap-ui-xx-debug(M|-m)odule(L|-l)oading=(true|x|X)/.test(location.search) || oCfgData["xx-debugModuleLoading"]) ? Log.Level.DEBUG : Math.min(Log.getLevel(), Log.Level.INFO)
+				(/sap-ui-xx-debug(M|-m)odule(L|-l)oading=(true|x|X)/.test(location.search) || Configuration.getValue("xx-debugModuleLoading")) ? Log.Level.DEBUG : Math.min(Log.getLevel(), Log.Level.INFO)
 			),
 
 			mKnownSubtypes = LoaderExtensions.getKnownSubtypes(),
@@ -1772,14 +1588,6 @@ sap.ui.define([
 		 */
 		jQuery.sap.getAllDeclaredModules = LoaderExtensions.getAllRequiredModules;
 
-
-		// take resource roots from configuration
-		var paths = {};
-		for ( var n in oCfgData.resourceroots ) {
-			paths[ui5ToRJS(n)] = oCfgData.resourceroots[n] || ".";
-		}
-		ui5loader.config({paths: paths});
-
 		var mUrlPrefixes = _ui5loader.getUrlPrefixes();
 		// dump the URL prefixes
 		oLog.info("URL prefixes set to:");
@@ -2131,9 +1939,9 @@ sap.ui.define([
 	// --------------------- support hooks ---------------------------------------------------------
 
 	// TODO should be in core, but then the 'callback' could not be implemented
-	if ( !(oCfgData.productive === true || oCfgData.productive === "true"  || oCfgData.productive === "x") ) {
-		SupportHotkeys.init(getModuleSystemInfo, oCfgData);
-		TestRecorderHotkeyListener.init(getModuleSystemInfo, oCfgData);
+	if ( !Configuration.getValue("productive") ) {
+		SupportHotkeys.init(getModuleSystemInfo);
+		TestRecorderHotkeyListener.init(getModuleSystemInfo);
 	}
 
 	// -----------------------------------------------------------------------

package/src/jquery.sap.history.js

@@ -217,7 +217,7 @@ sap.ui.define([
 		 * @param {function} fn The function that will be called when the identifier is matched with the hash.
 		 * @param {object} [oThis] If oThis is provided, the fn function's this keyword will be bound to this object.
 		 *
-		 * @returns {object} It returns the this object to enable chaining.
+		 * @returns {this} It returns the this object to enable chaining.
 		 *
 		 * @function
 		 * @public

package/src/jquery.sap.properties.js

@@ -67,7 +67,7 @@ sap.ui.define(['jquery.sap.global', 'sap/base/util/Properties'],
 	 * {@link #setProperty} to store or change a value for a key and {@link #getKeys}
 	 * can be used to retrieve an array of all keys that are currently stored in the collection.
 	 *
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @since 0.9.0
 	 * @name jQuery.sap.util.Properties
 	 * @public
@@ -83,7 +83,7 @@ sap.ui.define(['jquery.sap.global', 'sap/base/util/Properties'],
 	 * @param {string} sKey Key to return the value for
 	 * @param {string} [sDefaultValue=null] Optional, a default value that will be returned
 	 *    if the requested key is not in the collection
-	 * @returns {string} Value for the given key or the default value or <code>null</code>
+	 * @returns {string|null} Value for the given key or the default value or <code>null</code>
 	 *    if no default value or a falsy default value was given
 	 * @public
 	 *

package/src/jquery.sap.resources.js

@@ -99,7 +99,7 @@ sap.ui.define([
 	 * Exception: Fallback for "zh_HK" is "zh_TW" before zh.
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @since 0.9.0
 	 * @name jQuery.sap.util.ResourceBundle
 	 * @public

package/src/jquery.sap.script.js

@@ -267,7 +267,7 @@ sap.ui.define([
 	 * Use {@link jQuery.sap.getUriParameters} to create an instance of jQuery.sap.util.UriParameters.
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @since 0.9.0
 	 * @name jQuery.sap.util.UriParameters
 	 * @public

package/src/jquery.sap.storage.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @param {string} [sIdPrefix] Prefix used for the Ids. If not set a default prefix is used.
 	 * @returns {jQuery.sap.storage.Storage}
 	 *
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @since 0.11.0
 	 * @namespace
 	 * @public
@@ -97,7 +97,7 @@ sap.ui.define([
 	 * should be deleted the method {@link #removeAll} should be used.
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @since 0.11.0
 	 * @public
 	 * @name jQuery.sap.storage.Storage
@@ -134,7 +134,7 @@ sap.ui.define([
 	 * sStorageKeyPrefix is the id prefix defined for the storage instance (@see jQuery.sap#storage)
 	 *
 	 * @param {string} sId Id for the state to retrieve
-	 * @return {string} the string from the storage, if the retrieval
+	 * @return {string|null} the string from the storage, if the retrieval
 	 * was successful, and null otherwise
 	 * @public
 	 * @name jQuery.sap.storage.Storage#get
@@ -201,7 +201,7 @@ sap.ui.define([
 	 * Enumeration of the storage types supported by {@link jQuery.sap.storage.Storage}
 	 * @enum {string}
 	 * @public
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @since 0.11.0
 	 */
 	jQuery.sap.storage.Type = Storage.Type;

package/src/sap/base/i18n/ResourceBundle.js

@@ -320,9 +320,6 @@ sap.ui.define([
 	 *
 	 * @param {module:sap/base/i18n/ResourceBundle} oCustomBundle an instance of a <code>sap/base/i18n/ResourceBundle</code>
 	 * @private
-	 *
-	 * @function
-	 * @name module:sap/base/i18n/ResourceBundle.prototype._enhance
 	 */
 	ResourceBundle.prototype._enhance = function(oCustomBundle) {
 		if (oCustomBundle instanceof ResourceBundle) {
@@ -350,9 +347,8 @@ sap.ui.define([
 	 *     whenever <code>aArgs</code> is given, no matter whether the text contains placeholders or not
 	 *     and no matter whether <code>aArgs</code> contains a value for <i>n</i> or not.
 	 * @param {boolean} [bIgnoreKeyFallback=false] If set, <code>undefined</code> is returned instead of the key string, when the key is not found in any bundle or fallback bundle.
-	 * @returns {string} The value belonging to the key, if found; otherwise the key itself or <code>undefined</code> depending on <code>bIgnoreKeyFallback</code>.
+	 * @returns {string|undefined} The value belonging to the key, if found; otherwise the key itself or <code>undefined</code> depending on <code>bIgnoreKeyFallback</code>.
 	 *
-	 * @function
 	 * @public
 	 */
 	ResourceBundle.prototype.getText = function(sKey, aArgs, bIgnoreKeyFallback){
@@ -383,7 +379,7 @@ sap.ui.define([
 	 * @param {string} sValue the given input value
 	 * @param {string} sKey the key within the bundle
 	 * @param {array} [aArgs] arguments to format the message
-	 * @returns {string} formatted string, <code>null</code> if sValue is not a string
+	 * @returns {string|null} formatted string, <code>null</code> if sValue is not a string
 	 * @private
 	 */
 	ResourceBundle.prototype._formatValue = function(sValue, sKey, aArgs){
@@ -412,7 +408,7 @@ sap.ui.define([
 	 * The custom bundles are checked first in reverse order.
 	 * @param {string} sKey the key within the bundle
 	 * @param {array} [aArgs] arguments to format the message
-	 * @returns {string} the formatted value if found, <code>null</code> otherwise
+	 * @returns {string|null} the formatted value if found, <code>null</code> otherwise
 	 * @private
 	 */
 	ResourceBundle.prototype._getTextFromFallback = function(sKey, aArgs){
@@ -451,7 +447,7 @@ sap.ui.define([
 	 * The custom bundles are checked first in reverse order.
 	 * @param {string} sKey the key within the bundle
 	 * @param {array} [aArgs] arguments to format the message
-	 * @returns {string} the formatted value if found, <code>null</code> otherwise
+	 * @returns {string|null} the formatted value if found, <code>null</code> otherwise
 	 * @private
 	 */
 	ResourceBundle.prototype._getTextFromProperties = function(sKey, aArgs){
@@ -491,9 +487,8 @@ sap.ui.define([
 	 * used after the resource bundle has been loaded.
 	 *
 	 * @param {string} sKey Key to check
-	 * @returns {boolean} true if the text has been found in the concrete bundle
+	 * @returns {boolean} Whether the text has been found in the concrete bundle
 	 *
-	 * @function
 	 * @public
 	 */
 	ResourceBundle.prototype.hasText = function(sKey) {
@@ -537,7 +532,8 @@ sap.ui.define([
 	 *
 	 * @param {module:sap/base/i18n/ResourceBundle} oBundle ResourceBundle to extend
 	 * @param {boolean} [bAsync=false] Whether the resource should be loaded asynchronously
-	 * @returns The newly loaded properties (sync mode) or a Promise on the properties (async mode);
+	 * @returns {module:sap/base/util/Properties|null|Promise<module:sap/base/util/Properties|null>}
+	 *         The newly loaded properties (sync mode) or a Promise on the properties (async mode);
 	 *         value / Promise fulfillment will be <code>null</code> when the properties for the
 	 *         next fallback locale should not be loaded or when loading failed or when there
 	 *         was no more fallback locale

package/src/sap/base/util/LoaderExtensions.js

@@ -5,15 +5,17 @@
  */
 
 sap.ui.define([
-	'sap/ui/thirdparty/jquery',
+	'sap/ui/util/XMLHelper',
 	'sap/base/Log',
 	'sap/base/assert',
-	'sap/base/util/extend'
+	'sap/base/util/extend',
+	'sap/base/util/mixedFetch'
 ], function(
-	jQuery,
+	XMLHelper,
 	Log,
 	assert,
-	extend
+	extend,
+	mixedFetch
 ) {
 	"use strict";
 
@@ -246,9 +248,7 @@ sap.ui.define([
 		var sType,
 			oData,
 			sUrl,
-			oError,
-			oDeferred,
-			fnDone,
+			fnDone = function() {},
 			iSyncCallBehavior;
 
 		if (LoaderExtensions.notifyResourceLoading) {
@@ -271,44 +271,30 @@ sap.ui.define([
 
 		assert(/^(xml|html|json|text)$/.test(sType), "type must be one of xml, html, json or text");
 
-		oDeferred = mOptions.async ? new jQuery.Deferred() : null;
-
-		function handleData(d, e) {
-			if (d == null && mOptions.failOnError) {
-				oError = e || new Error("no data returned for " + sResourceName);
-				if (mOptions.async) {
-					oDeferred.reject(oError);
-					Log.error(oError);
-				}
-				if (fnDone) {
-					fnDone();
-				}
-				return null;
-			}
-
-			if (mOptions.async) {
-				oDeferred.resolve(d);
-			}
-			if (fnDone) {
-				fnDone();
-			}
-			return d;
-		}
-
 		function convertData(d) {
-			var vConverter = jQuery.ajaxSettings.converters["text " + sType];
-			if (typeof vConverter === "function") {
-				d = vConverter(d);
-			}
-			return handleData(d);
+		    switch (sType) {
+				case "json":
+					return JSON.parse(d);
+				case "xml":
+					return XMLHelper.parse(d);
+				default:
+					return d;
+		    }
 		}
 
 		oData = sap.ui.loader._.getModuleContent(sResourceName, mOptions.url);
 
 		if (oData != undefined) {
+			// data available
 			oData = convertData(oData);
-		} else {
 
+			if (mOptions.async) {
+				return Promise.resolve(oData);
+			} else {
+				return oData;
+			}
+		} else {
+			// load data
 			iSyncCallBehavior = sap.ui.loader._.getSyncCallBehavior();
 			if (!mOptions.async && iSyncCallBehavior) {
 				if (iSyncCallBehavior >= 1) { // temp. raise a warning only
@@ -318,34 +304,56 @@ sap.ui.define([
 				}
 			}
 
-			jQuery.ajax({
-				url: sUrl = mOptions.url || sap.ui.loader._.getResourcePath(sResourceName),
-				async: mOptions.async,
-				dataType: sType,
-				headers: mOptions.headers,
-				success: function(data, textStatus, xhr) {
-					oData = handleData(data);
-				},
-				error: function(xhr, textStatus, error) {
-					oError = new Error("resource " + sResourceName + " could not be loaded from " + sUrl + ". Check for 'file not found' or parse errors. Reason: " + error);
-					oError.status = textStatus;
-					oError.error = error;
-					oError.statusCode = xhr.status;
-					oData = handleData(null, oError);
-				}
-			});
+			var oHeaders = {};
+			if (sType) {
+				oHeaders["Accept"] = mixedFetch.ContentTypes[sType.toUpperCase()];
+			}
 
-		}
+			sUrl = mOptions.url || sap.ui.loader._.getResourcePath(sResourceName);
+
+			var pResponse = mixedFetch(sUrl, {
+				headers: Object.assign(oHeaders, mOptions.headers)
+			}, !mOptions.async)
+			.then(function(response) {
+				if (response.ok) {
+					return response.text().then(function(responseText) {
+						return {
+							data: convertData(responseText)
+						};
+					});
+				} else {
+					var oError = new Error("resource " + sResourceName + " could not be loaded from " + sUrl +
+						". Check for 'file not found' or parse errors. Reason: " + response.statusText || response.status);
+					oError.status = response.statusText;
+					oError.statusCode = response.status;
+					throw oError;
+				}
+			})
+			.catch(function(error) {
+				return {
+					data: null,
+					error: error
+				};
+			})
+			.then(function(oInfo) {
+				fnDone();
 
-		if (mOptions.async) {
-			return Promise.resolve(oDeferred);
-		}
+				if (oInfo.data !== null) {
+					return oInfo.data;
+				} else if (mOptions.failOnError) {
+					Log.error(oInfo.error);
+					throw oInfo.error;
+				} else {
+					return null;
+				}
+			});
 
-		if (oError != null && mOptions.failOnError) {
-			throw oError;
+			if (mOptions.async) {
+				return pResponse;
+			} else {
+				return pResponse.unwrap();
+			}
 		}
-
-		return oData;
 	};
 
 	/**

package/src/sap/base/util/ObjectPath.js

@@ -89,7 +89,7 @@ sap.ui.define([], function() {
 	 * @static
 	 * @param {string|string[]} vObjectPath Path as string where each name is separated by '.'. Can also be an array of names.
 	 * @param {Object} [oRootContext=window] Root context where the path starts
-	 * @returns {any} Returns the value located in the provided path, or <code>undefined</code> if the path does not exist completely.
+	 * @returns {any|undefined} Returns the value located in the provided path, or <code>undefined</code> if the path does not exist completely.
 	 * @example
 	 * ObjectPath.get("my.test.module", root) === root.my.test.module
 	 * ObjectPath.get(["my", "test", "otherModule"], root) === root.my.test.otherModule

package/src/sap/base/util/Properties.js

@@ -39,7 +39,7 @@ sap.ui.define(['sap/base/util/LoaderExtensions'], function(LoaderExtensions) {
 	 * @param {string} sKey Key to return the value for
 	 * @param {string} [sDefaultValue=null] Optional, a default value that will be returned
 	 *    if the requested key is not in the collection
-	 * @returns {string} Value for the given key or the default value or <code>null</code>
+	 * @returns {string|null} Value for the given key or the default value or <code>null</code>
 	 *    if no default value or a falsy default value was given
 	 * @public
 	 */