@openui5/sap.ui.core 1.96.2 → 1.96.3

package/src/sap/ui/core/mvc/JSView.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 *
 	 * @extends sap.ui.core.mvc.View
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 * @deprecated Since 1.90. Instead use {@link topic:e6bb33d076dc4f23be50c082c271b9f0 Typed Views}
 	 * by defining the view class with {@link sap.ui.core.mvc.View.extend View.extend} and
 	 * creating the view instances with {@link sap.ui.core.mvc.View.create View.create}.

package/src/sap/ui/core/mvc/TemplateView.js

@@ -29,7 +29,7 @@ function(View, TemplateViewRenderer, ViewType, Log) {
 	 * @extends sap.ui.core.mvc.View
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 *
 	 * @public
 	 * @deprecated Since version 1.56.0, use {@link sap.ui.core.mvc.XMLView} in combination with

package/src/sap/ui/core/mvc/View.js

@@ -145,7 +145,7 @@ sap.ui.define([
 	 * The default implementation of this method returns <code>false</code>.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 *
 	 * @public
 	 * @alias sap.ui.core.mvc.View

package/src/sap/ui/core/mvc/XMLView.js

@@ -96,7 +96,7 @@ sap.ui.define([
 	 * control's dependents aggregation or add it by using {@link sap.ui.core.mvc.XMLView#addDependent}.
 	 *
 	 * @extends sap.ui.core.mvc.View
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 *
 	 * @public
 	 * @alias sap.ui.core.mvc.XMLView

package/src/sap/ui/core/plugin/DeclarativeSupport.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @see sap.ui.core.DeclarativeSupport
 	 * @public
 	 * @since 1.7.0
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 * @alias sap.ui.core.plugin.DeclarativeSupport
 	 */
 	var DeclarativeSupportPlugin = function() {

package/src/sap/ui/core/plugin/LessSupport.js

@@ -37,7 +37,7 @@
 			 *        feature - DO NOT USE IN PRODUCTIVE SCENARIOS!!
 			 *
 			 * @author Peter Muessig
-			 * @version 1.96.2
+			 * @version 1.96.3
 			 * @private
 			 * @alias sap.ui.core.plugin.LessSupport
 			 */

package/src/sap/ui/core/plugin/TemplatingSupport.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @author Peter Muessig
 	 * @public
 	 * @since 1.15.0
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 * @alias sap.ui.core.plugin.TemplatingSupport
 	 */
 	var TemplatingSupport = function() {

package/src/sap/ui/core/postmessage/Bus.js

@@ -38,7 +38,7 @@ function (
 	 * @alias sap.ui.core.postmessage.Bus
 	 * @author SAP SE
 	 * @since 1.56.0
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 * @private
 	 * @ui5-restricted sap.ui.core.support, sap.ui.support, sap.ui.rta
 	 */

package/src/sap/ui/core/postmessage/confirmationDialog.js

@@ -13,7 +13,7 @@ sap.ui.define(function () {
 	 *
 	 * @author SAP SE
 	 * @since 1.56.0
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 *
 	 * @function
 	 * @param {string} sMessage - Dialog message

package/src/sap/ui/core/search/OpenSearchProvider.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * A SearchProvider which uses the OpenSearch protocol (either JSON or XML).
 	 * @extends sap.ui.core.search.SearchProvider
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 *
 	 * @public
 	 * @alias sap.ui.core.search.OpenSearchProvider

package/src/sap/ui/core/search/SearchProvider.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log", 'sap/ui/core/library'],
 	 *
 	 * Do not create instances of this class, but use a concrete subclass instead.
 	 * @extends sap.ui.core.Element
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 *
 	 * @public
 	 * @alias sap.ui.core.search.SearchProvider

package/src/sap/ui/core/service/Service.js

@@ -71,7 +71,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/assert", "sap/base/Log"],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 * @alias sap.ui.core.service.Service
 	 * @abstract
 	 * @private

package/src/sap/ui/core/service/ServiceFactory.js

@@ -83,7 +83,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/service/Service', "sap/base/as
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 * @alias sap.ui.core.service.ServiceFactory
 	 * @private
 	 * @ui5-restricted sap.ushell

package/src/sap/ui/core/service/ServiceFactoryRegistry.js

@@ -18,7 +18,7 @@ sap.ui.define(['./ServiceFactory', "sap/base/assert"],
 	 * The service factory registry.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 * @alias sap.ui.core.service.ServiceFactoryRegistry
 	 * @private
 	 * @ui5-restricted sap.ushell

package/src/sap/ui/core/support/Plugin.js

@@ -17,7 +17,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/ui/thirdparty/jquery", "sap/base/util/
 	 *
 	 * @abstract
 	 * @extends sap.ui.base.Object
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 * @private
 	 * @ui5-restricted
 	 * @alias sap.ui.core.support.Plugin

package/src/sap/ui/core/support/Support.js

@@ -26,7 +26,7 @@ sap.ui.define(['sap/ui/base/EventProvider', './Plugin', "sap/base/util/UriParame
 	 * @class This class provides the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 	 *
 	 * @extends sap.ui.base.EventProvider
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 * @private
 	 * @alias sap.ui.core.support.Support
 	 */

package/src/sap/ui/core/support/plugins/ControlTree.js

@@ -51,7 +51,7 @@ sap.ui.define([
 		 * @class This class represents the ControlTree plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.96.2
+		 * @version 1.96.3
 		 * @private
 		 * @alias sap.ui.core.support.plugins.ControlTree
 		 */

package/src/sap/ui/core/support/plugins/Interaction.js

@@ -38,7 +38,7 @@ sap.ui.define([
 		 * With this plugIn the performance measurements are displayed
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.96.2
+		 * @version 1.96.3
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Interaction
 		 */

package/src/sap/ui/core/support/plugins/LocalStorage.js

@@ -15,7 +15,7 @@ sap.ui.define(['sap/ui/core/support/Plugin', "sap/base/Log"],
 		 * @class This class represents the LocalStorage plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.96.2
+		 * @version 1.96.3
 		 * @private
 		 * @alias sap.ui.core.support.plugins.LocalStorage
 		 */

package/src/sap/ui/core/support/plugins/Performance.js

@@ -56,7 +56,7 @@ sap.ui.define([
 		 * With this plugIn the performance measurements are displayed
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.96.2
+		 * @version 1.96.3
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Performance
 		 */

package/src/sap/ui/core/support/plugins/Selector.js

@@ -20,7 +20,7 @@ sap.ui.define([
 		 * @class This class represents the selector plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.96.2
+		 * @version 1.96.3
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Selector
 		 */

package/src/sap/ui/core/support/plugins/TechInfo.js

@@ -23,7 +23,7 @@ sap.ui.define([
 		 * @class This class represents the technical info plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.96.2
+		 * @version 1.96.3
 		 * @private
 		 * @alias sap.ui.core.support.plugins.TechInfo
 		 */

package/src/sap/ui/core/support/plugins/Trace.js

@@ -19,7 +19,7 @@ sap.ui.define([
 		 * @class This class represents the trace plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.96.2
+		 * @version 1.96.3
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Trace
 		 */

package/src/sap/ui/core/support/plugins/ViewInfo.js

@@ -20,7 +20,7 @@ sap.ui.define([
 		 * Creates an instance of sap.ui.core.support.plugins.ViewInfo.
 		 * @class This class represents the ViewInfo plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.96.2
+		 * @version 1.96.3
 		 * @private
 		 * @alias sap.ui.core.support.plugins.ViewInfo
 		 */

package/src/sap/ui/core/theming/Parameters.js

@@ -17,11 +17,10 @@ sap.ui.define([
 	'sap/base/Log',
 	'sap/base/util/extend',
 	'sap/ui/core/ThemeCheck',
-	'sap/base/util/LoaderExtensions',
 	'sap/ui/thirdparty/jquery',
 	'./ThemeHelper'
 ],
-	function(URI, Element, UriParameters, Log, extend, ThemeCheck, LoaderExtensions, jQuery, ThemeHelper) {
+	function(URI, Element, UriParameters, Log, extend, ThemeCheck, jQuery, ThemeHelper) {
 	"use strict";
 
 	var oCfgData = window["sap-ui-config"] || {};
@@ -60,8 +59,6 @@ sap.ui.define([
 
 		var bUseInlineParameters = UriParameters.fromQuery(window.location.search).get("sap-ui-xx-no-inline-theming-parameters") !== "true";
 
-		var oComputedScopeStyle, oDummyScopeElement;
-
 		/**
 		 * Resolves relative URLs in parameter values.
 		 * Only for inline-parameters.
@@ -81,33 +78,6 @@ sap.ui.define([
 			return sUrl;
 		}
 
-		/**
-		 * Checks the given parameter value if it contains a relative URL.
-		 * If so we read a second css-variable containing a ui5:// url which needs to be resolved.
-		 * @param {string} sParam parameter name
-		 * @returns {string} the parameter value, if necessary a ui5://... URL is resolved
-		 */
-		function checkAndResolveUI5Url(sParamValue, sParameterName) {
-
-			var aMatch = rCssUrl.exec(sParamValue);
-			if (aMatch && aMatch[1]) {
-				// read companion-variable, can contain a ui5:// url, or an already absolute url
-				var oBodyStyle = window.getComputedStyle(document.body || document.documentElement);
-				sParamValue = oBodyStyle.getPropertyValue("--" + sParameterName + "__asResolvedUrl").trim();
-				if (sParamValue) {
-					// JSON.parse helps us get a consistent escaping situation
-					sParamValue = JSON.parse(sParamValue);
-					var sResolvedUrl = LoaderExtensions.resolveUI5Url(sParamValue);
-					// stringify again to preserve original escaping
-					sParamValue = "url(" + JSON.stringify(sResolvedUrl) + ")";
-				} else {
-					Log.error("The parameter '" + sParameterName + "' contains a url, but no matching resolved-url CSS variable could be found.");
-				}
-			}
-
-			return sParamValue;
-		}
-
 		function mergeParameterSet(mCurrent, mNew, sThemeBaseUrl) {
 			for (var sParam in mNew) {
 				if (typeof mCurrent[sParam] === "undefined") {
@@ -145,20 +115,6 @@ sap.ui.define([
 					mergeParameterSet(mParameters["scopes"][sScopeName], mNewParameters["scopes"][sScopeName], sThemeBaseUrl);
 				}
 			}
-
-			var aScopeList = Object.keys(mParameters["scopes"]);
-			if (aScopeList.length) {
-				if (aScopeList.length > 1) {
-					Log.error("There are multiple theming parameter scopes available but only a single scope is supported. Only the first scope '" + aScopeList[0] + "' is used for retrieval of parameters.");
-				}
-				// Add dummy scope element
-				if (!oComputedScopeStyle) {
-					oDummyScopeElement = document.createElement("span");
-					oDummyScopeElement.classList.add(aScopeList[0]);
-					document.documentElement.appendChild(oDummyScopeElement);
-					oComputedScopeStyle = window.getComputedStyle(oDummyScopeElement);
-				}
-			}
 		}
 
 		function forEachStyleSheet(fnCallback) {
@@ -168,11 +124,6 @@ sap.ui.define([
 		}
 
 		function parseParameters(sId) {
-			// only parse parameters if the given lib does not support CSS variables
-			if (libSupportsCSSVariables(sId)) {
-				return false;
-			}
-
 			var oUrl = getThemeBaseUrlForId(sId);
 
 			var bThemeApplied = ThemeCheck.checkStyle(sId);
@@ -209,44 +160,13 @@ sap.ui.define([
 			return false; //could not parse parameters OR theme is not applied OR library has no parameters
 		}
 
-		function libSupportsCSSVariables(sId) {
-			var sLibName = sId.replace("sap-ui-theme-", "").replace(/\./g, "-");
-			var sVariablesMarker = !!(window.getComputedStyle(document.body || document.documentElement).getPropertyValue("--sapUiTheme-" + sLibName).trim());
-			// retreive scope list from metadata (if the theme supports them)
-			if (sVariablesMarker) {
-				var oMetadata =  ThemeHelper.getMetadata(sId);
-				if (oMetadata && oMetadata.Scopes && oMetadata.Scopes.length > 0) {
-					var mScopes = {};
-					oMetadata.Scopes.forEach(function(sScope) {
-						mScopes[sScope] = {};
-					});
-
-					// merge empty scopes into parameters cache
-					// will be filled one-by-one when accessing scoped variables later
-					mergeParameters({
-						"default": {},
-						scopes: mScopes
-					});
-				}
-			}
-			return sVariablesMarker;
-		}
-
 		/**
 		 * Load parameters for a library/theme combination as identified by the URL of the library.css
 		 * @param {string} sId the library name for which parameters might be loaded
-		 * @param {boolean} [bGetAll] whether the loadParameters call stems from a Parameters.get() call
 		 */
-		function loadParameters(sId, bGetAll) {
+		function loadParameters(sId) {
 			var oUrl = getThemeBaseUrlForId(sId);
 
-			// [Compatibility]: the legacy sync API must return a map of ALL parameter values.
-			// With CSS wariables supported, we can only get this map by requesting the library-parameters.json.
-			// The DOM API does not provide an enumeration of all variables.
-			if (libSupportsCSSVariables(sId) && !bGetAll) {
-				return;
-			}
-
 			// try to parse the inline-parameters for the given library
 			// this may fail for a number of reasons, see below
 			if (!parseParameters(sId)) {
@@ -371,24 +291,16 @@ sap.ui.define([
 
 		/**
 		 * Retrieves a map containing all inline-parameters.
-		 * Parameters from CSS Variables are dynamically written to the mParameters data-structure on demand,
-		 * everytime a parameter is read from a CSS variable via DOM API.
-		 *
-		 * IMPORTANT: See 'bGetAll' for special SYNC path for Parameters.get() and libraries with CSS Variables
 		 *
-		 * @param {boolean} bAsync whether to load and parse the parameters asynchronously
-		 * @param {boolean} bGetAll SYNC path only: when Parameters.get() is called,
-		 *                          we might need to enforce the loading of a library-parameters.json for libraries using CSS Variables instead of inline-parameters
+		 * @param {boolean} bAsync=undefined whether to load and parse the parameters asynchronously, default sync
 		 * @returns {object} a map of all parameters
 		 */
-		function getParameters(bAsync, bGetAll) {
+		function getParameters(bAsync) {
 			// Inital loading
 			if (!mParameters) {
 				// Merge an empty parameter set to initialize the internal object
 				mergeParameters({}, "");
 
-				sTheme = sap.ui.getCore().getConfiguration().getTheme();
-
 				forEachStyleSheet(function (sId) {
 					if (bAsync) {
 						if (ThemeCheck.checkStyle(sId)) {
@@ -397,7 +309,7 @@ sap.ui.define([
 							aParametersToLoad.push(sId);
 						}
 					} else {
-						loadParameters(sId, bGetAll);
+						loadParameters(sId);
 					}
 				});
 			}
@@ -423,13 +335,10 @@ sap.ui.define([
 
 		/**
 		 * Loads library-parameters.json files if some libraries are missing.
-		 * @param {boolean} bGetAll whether we need to enforce the loading of library-parameters.json files for libraries with CSS variables
 		 */
-		function loadPendingLibraryParameters(bGetAll) {
+		function loadPendingLibraryParameters() {
 			// lazy loading of further library parameters
-			aParametersToLoad.forEach(function(sLibId) {
-				loadParameters(sLibId, bGetAll);
-			});
+			aParametersToLoad.forEach(loadParameters);
 
 			// clear queue
 			aParametersToLoad = [];
@@ -450,27 +359,6 @@ sap.ui.define([
 			}
 		};
 
-		function lookUpParameter(mParams, sParameterName, bUseScope) {
-			var sParam = mParams[sParameterName];
-
-			// if not found in cache it we read a CSS variable
-			if (!sParam) {
-				// In case scope is available use dummy element with given scope else use the computed style
-				// of document.body or if body is not available the scope of document.documentElement
-				var oComputedStyle = bUseScope ? oComputedScopeStyle : window.getComputedStyle(document.body || document.documentElement);
-				sParam = oComputedStyle.getPropertyValue("--" + sParameterName).trim();
-				// DOM Api returns "" for unkown variables, UI5 Api must return undefined
-				sParam = sParam != "" ? sParam : undefined;
-				if (sParam) {
-					sParam = checkAndResolveUI5Url(sParam, sParameterName);
-					// cache the url-resolved parameter value for later usage
-					mParams[sParameterName] = sParam;
-				}
-			}
-
-			return sParam;
-		}
-
 		/**
 		 * Returns parameter value from given map and handles legacy parameter names
 		 *
@@ -484,22 +372,22 @@ sap.ui.define([
 		 * @private
 		 */
 		function getParam(mOptions) {
-			var bAsync = mOptions.async, bUseScope = false, oParams = getParameters(bAsync);
+			var bAsync = mOptions.async, oParams = getParameters(bAsync);
 			if (mOptions.scopeName) {
 				oParams = oParams["scopes"][mOptions.scopeName];
-				bUseScope = true;
 			} else {
 				oParams = oParams["default"];
 			}
 
-			var sParamValue = lookUpParameter(oParams, mOptions.parameterName, bUseScope);
+			var sParamValue = oParams[mOptions.parameterName];
+
 			// [Compatibility]: if a parameter contains a prefix, we cut off the ":" and try again
 			// e.g. "my.lib:paramName"
 			if (!sParamValue) {
 				var iIndex = mOptions.parameterName.indexOf(":");
 				if (iIndex != -1) {
 					var sParamNameWithoutColon = mOptions.parameterName.substr(iIndex + 1);
-					sParamValue = lookUpParameter(oParams, sParamNameWithoutColon, bUseScope);
+					sParamValue = oParams[sParamNameWithoutColon];
 				}
 			}
 
@@ -554,7 +442,7 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.core
 		 * @param {boolean} [bAvoidLoading] Whether loading of parameters should be avoided
 		 * @param {boolean} [bAsync] Whether loading of parameters should be asynchronous
-		 * @return {array|undefined} Scope names
+		 * @return {string[]|undefined} Scope names
 		 */
 		Parameters._getScopes = function(bAvoidLoading, bAsync) {
 			if ( bAvoidLoading && !mParameters ) {
@@ -641,16 +529,6 @@ sap.ui.define([
 		 * </p>
 		 *
 		 * <p>
-		 * <b>Important, since 1.93:</b>
-		 * When using the <code>Parameters.get()</code> API to retrieve theming parameters defined as CSS variables,
-		 * please be aware that the API can also unknowingly retrieve arbitrary CSS variables defined in the DOM.
-		 * All CSS variables defined via the <code>:root</code> pseudo-class can be retrieved this way.
-		 * Please make sure to only access theming parameters defined in a UI5 theme/library.
-		 * </p>
-		 *
-		 * <br/>
-		 *
-		 * <p>
 		 * The following API variants are available (see also the below examples):
 		 * <ul>
 		 * <li> <b>(deprecated since 1.92)</b> If no parameter is given a key-value map containing all parameters is returned</li>
@@ -681,7 +559,7 @@ sap.ui.define([
 		 *
 		 * @example <caption>Scenario 2: Some Parameters are missing </caption>
 		 *  // "sapUiParam1", "sapUiParam2" are already available
-		 *  // "sapUiParam3" is not yet available missing
+		 *  // "sapUiParam3" is not yet available
 		 *  Parameters.get({
 		 *     name: ["sapUiParam1", "sapUiParam2", "sapUiParam3"],
 		 *     callback: function(mParams) {
@@ -730,6 +608,9 @@ sap.ui.define([
 					"Consider using the API only when required, e.g. onBeforeRendering.");
 			}
 
+			if (!sTheme) {
+				sTheme = sap.ui.getCore().getConfiguration().getTheme();
+			}
 			// Parameters.get() without arguments returns
 			// copy of complete default parameter set
 			if (arguments.length === 0) {
@@ -743,10 +624,11 @@ sap.ui.define([
 				);
 
 				// first try to load all pending parameters
-				loadPendingLibraryParameters(true);
+				loadPendingLibraryParameters();
+
 				// retrieve parameters
 				// optionally might also trigger a sync JSON request, if a library was loaded but not parsed yet
-				var oParams = getParameters(false, true);
+				var oParams = getParameters();
 				return Object.assign({}, oParams["default"]);
 			}
 
@@ -810,6 +692,7 @@ sap.ui.define([
 			if (bAsync && fnAsyncCallback && Object.keys(vResult).length !== aNames.length) {
 				if (!sap.ui.getCore().isThemeApplied()) {
 					resolveWithParameter = function () {
+						sap.ui.getCore().detachThemeChanged(resolveWithParameter);
 						var vParams = this.get({ // Don't pass callback again
 							name: vName.name,
 							scopeElement: vName.scopeElement
@@ -821,7 +704,6 @@ sap.ui.define([
 
 						fnAsyncCallback(vParams);
 						aCallbackRegistry.splice(aCallbackRegistry.findIndex(findRegisteredCallback), 1);
-						sap.ui.getCore().detachThemeChanged(resolveWithParameter);
 					}.bind(this);
 
 					// Check if identical callback is already registered and reregister with current parameters
@@ -881,11 +763,9 @@ sap.ui.define([
 			// hidden parameter {boolean} bOnlyWhenNecessary
 			var bOnlyWhenNecessary = arguments[0] === true;
 			if ( !bOnlyWhenNecessary || sap.ui.getCore().getConfiguration().getTheme() !== sTheme ) {
+				sTheme = sap.ui.getCore().getConfiguration().getTheme();
+				aParametersToLoad = [];
 				mParameters = null;
-				if (oDummyScopeElement) {
-					document.documentElement.removeChild(oDummyScopeElement);
-					oDummyScopeElement = oComputedScopeStyle = undefined;
-				}
 				ThemeHelper.reset();
 			}
 		};

package/src/sap/ui/core/theming/ThemeHelper.js

@@ -36,51 +36,40 @@ sap.ui.define([
 			return mLibThemeMetadata[sLibName];
 		}
 
-		var oMetadata, sMetadataJSON;
+		var oMetadataElement = document.createElement("span");
+		oMetadataElement.classList.add("sapThemeMetaData-UI5-" + sLibName);
+		document.documentElement.appendChild(oMetadataElement);
+		var sDataUri = window.getComputedStyle(oMetadataElement).getPropertyValue("background-image");
+		document.documentElement.removeChild(oMetadataElement);
 
-		var oBodyStyle = window.getComputedStyle(document.body || document.documentElement);
-		var sVariablesMarker = oBodyStyle.getPropertyValue("--sapUiTheme-" + sLibName).trim();
-
-		// Try first to read the metadata from the CSS variables in case CSS variables are supported
-		if (sVariablesMarker) {
-			// read metadata
-			sMetadataJSON = oBodyStyle.getPropertyValue("--sapThemeMetaData-UI5-" + sLibName).trim();
+		var aDataUriMatch = /\(["']?data:text\/plain;utf-8,(.*?)['"]?\)/i.exec(sDataUri);
+		if (!aDataUriMatch || aDataUriMatch.length < 2) {
+			return null;
 		}
-		// Fallback to inline metadata in case no CSS variables are supported or metadata is only available inline
-		if (!sMetadataJSON) {
-			var oMetadataElement = document.createElement("span");
-			oMetadataElement.classList.add("sapThemeMetaData-UI5-" + sLibName);
-			document.documentElement.appendChild(oMetadataElement);
-			var sDataUri = window.getComputedStyle(oMetadataElement).getPropertyValue("background-image");
-			document.documentElement.removeChild(oMetadataElement);
-
-			var aDataUriMatch = /\(["']?data:text\/plain;utf-8,(.*?)['"]?\)/i.exec(sDataUri);
-			if (!aDataUriMatch || aDataUriMatch.length < 2) {
-				return null;
-			}
 
-			var sMetaData = aDataUriMatch[1];
+		var sMetaData = aDataUriMatch[1];
 
-			// The following lines of code are moved unchanged from ThemeCheck in order to not introduce any regressions but
-			// neverteheless it's not fully clear if detection of URI encoding and URI decoding itself (especially manual encoding of spaces)
-			// is necessary
+		// [COMPATIBILITY]: The following lines of code are moved unchanged from ThemeCheck in order to not introduce any regressions but
+		// neverteheless it's not fully clear if detection of URI encoding and URI decoding itself (especially manual encoding of spaces)
+		// is necessary
 
-			// Try to detect URI encoding by checking for first and last character for not encoded characters
-			if (sMetaData.charAt(0) !== "{" && sMetaData.charAt(sMetaData.length - 1) !== "}") {
-				try {
-					sMetaData = decodeURI(sMetaData);
-				} catch (ex) {
-					// ignore
-				}
+		// Try to detect URI encoding by checking for first and last character for not encoded characters
+		if (sMetaData.charAt(0) !== "{" && sMetaData.charAt(sMetaData.length - 1) !== "}") {
+			try {
+				sMetaData = decodeURI(sMetaData);
+			} catch (ex) {
+				// ignore
 			}
+		}
 
-			// Remove superfluous escaping of double quotes
-			sMetaData = sMetaData.replace(/\\"/g, '"');
+		// Remove superfluous escaping of double quotes
+		sMetaData = sMetaData.replace(/\\"/g, '"');
 
-			// Replace encoded spaces => not clear if this is really necessary and if there is any valid case where spaces are URI encoded
-			//							 but we could not detect URI encoding. Keep coding in order to avoid regression.
-			sMetadataJSON = sMetaData.replace(/%20/g, " ");
-		}
+		// Replace encoded spaces => not clear if this is really necessary and if there is any valid case where spaces are URI encoded
+		//							 but we could not detect URI encoding. Keep coding in order to avoid regression.
+		var sMetadataJSON = sMetaData.replace(/%20/g, " ");
+
+		var oMetadata;
 		try {
 			oMetadata = JSON.parse(sMetadataJSON);
 			mLibThemeMetadata[sLibName] = oMetadata;

package/src/sap/ui/core/tmpl/DOMAttribute.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/core/Element', 'sap/ui/core/library'],
 	 * @class
 	 * Represents a DOM attribute of a DOM element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.96.2
+	 * @version 1.96.3
 	 *
 	 * @public
 	 * @since 1.15