@openui5/sap.ui.core 1.117.1 → 1.119.0

package/src/sap/ui/core/themes/base/global.less

@@ -805,14 +805,14 @@
 @sapUiIndication7TextColor: @sapIndicationColor_7_TextColor;
 @sapUiIndication7HoverBackground: @sapIndicationColor_7_Hover_Background;
 @sapUiIndication7ActiveBackground: @sapIndicationColor_7_Active_Background;
-@sapUiIndication7ActiveBorderColor: @sapIndicationColor_6_Active_BorderColor;
-@sapUiIndication7ActiveTextColor: @sapIndicationColor_6_Active_TextColor;
-@sapUiIndication7SelectedBackground: @sapIndicationColor_6_Selected_Background;
-@sapUiIndication7SelectedBorderColor: @sapIndicationColor_6_Selected_BorderColor;
-@sapUiIndication7SelectedTextColor: @sapIndicationColor_6_Selected_TextColor;
-@sapUiIndication7b: @sapIndicationColor_6b;
-@sapUiIndication7bBorderColor: @sapIndicationColor_6_BorderColor;
-@sapUiIndication7bHoverBackground: @sapIndicationColor_6b_Hover_Background;
+@sapUiIndication7ActiveBorderColor: @sapIndicationColor_7_Active_BorderColor;
+@sapUiIndication7ActiveTextColor: @sapIndicationColor_7_Active_TextColor;
+@sapUiIndication7SelectedBackground: @sapIndicationColor_7_Selected_Background;
+@sapUiIndication7SelectedBorderColor: @sapIndicationColor_7_Selected_BorderColor;
+@sapUiIndication7SelectedTextColor: @sapIndicationColor_7_Selected_TextColor;
+@sapUiIndication7b: @sapIndicationColor_7b;
+@sapUiIndication7bBorderColor: @sapIndicationColor_7_BorderColor;
+@sapUiIndication7bHoverBackground: @sapIndicationColor_7b_Hover_Background;
 @sapUiIndication8: @sapIndicationColor_8;
 @sapUiIndication8Background: @sapIndicationColor_8_Background;
 @sapUiIndication8BorderColor: @sapIndicationColor_8_BorderColor;

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

@@ -704,7 +704,7 @@ sap.ui.define([
 			if (bAsync && fnAsyncCallback && Object.keys(vResult).length !== aNames.length) {
 				if (!ThemeManager.themeLoaded) {
 					resolveWithParameter = function () {
-						ThemeManager.detachEvent("ThemeChanged", resolveWithParameter);
+						ThemeManager.detachEvent("applied", resolveWithParameter);
 						var vParams = this.get({ // Don't pass callback again
 							name: vName.name,
 							scopeElement: vName.scopeElement
@@ -721,13 +721,13 @@ sap.ui.define([
 					// Check if identical callback is already registered and reregister with current parameters
 					iIndex = aCallbackRegistry.findIndex(findRegisteredCallback);
 					if (iIndex >= 0) {
-						ThemeManager.detachEvent("ThemeChanged", aCallbackRegistry[iIndex].eventHandler);
+						ThemeManager.detachEvent("applied", aCallbackRegistry[iIndex].eventHandler);
 						aCallbackRegistry[iIndex].eventHandler = resolveWithParameter;
 					} else {
 						aCallbackRegistry.push({ callback: fnAsyncCallback, eventHandler: resolveWithParameter });
 					}
-					ThemeManager.attachEvent("ThemeChanged", resolveWithParameter);
-					return undefined; // Don't return partial result in case we expect themeChanged event.
+					ThemeManager.attachEvent("applied", resolveWithParameter);
+					return undefined; // Don't return partial result in case we expect applied event.
 				} else {
 					Log.error("One or more parameters could not be found.", "sap.ui.core.theming.Parameters");
 				}
@@ -789,7 +789,6 @@ sap.ui.define([
 				sTheme = Theming.getTheme();
 				aParametersToLoad = [];
 				mParameters = null;
-				ThemeHelper.reset();
 			}
 		};
 

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

@@ -8,9 +8,53 @@ sap.ui.define([
 ], function (Log) {
 	"use strict";
 
-	// TODO reset map onThemeChanged
 	var mLibThemeMetadata = {};
 
+
+	// Theme defaulting
+	const DEFAULT_THEME = "sap_horizon";
+
+	// dark mode detection
+	const bDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches;
+
+	// Theme Fallback
+	const rThemePattern = /^([a-zA-Z0-9_]*)(_(hcb|hcw|dark))$/g;
+
+	/**
+	 * The list of all known themes incl. their variants.
+	 * Any SAP theme outside this list will receive a fallback to the predefined default theme.
+	 *
+	 * Note: This list needs to be updated on each release and/or removal of a theme.
+	 */
+	const aKnownThemes = [
+		// horizon
+		"sap_horizon",
+		"sap_horizon_dark",
+		"sap_horizon_hcb",
+		"sap_horizon_hcw",
+
+		// fiori_3
+		"sap_fiori_3",
+		"sap_fiori_3_dark",
+		"sap_fiori_3_hcb",
+		"sap_fiori_3_hcw",
+
+		// belize
+		"sap_belize",
+		"sap_belize_plus",
+		"sap_belize_hcb",
+		"sap_belize_hcw",
+
+		// bluecrystal (deprecated)
+		"sap_bluecrystal",
+
+		// hcb (deprecated) - the standard HCB theme, newer themes have a dedicated HCB/HCW variant
+		"sap_hcb"
+	];
+
+	// cache for already calculated theme fallbacks
+	const mThemeFallbacks = {};
+
 	/**
 	 *
 	 * @since 1.92.0
@@ -156,5 +200,60 @@ sap.ui.define([
 		return !!aCssRules && aCssRules.length > 0;
 	};
 
+	/**
+	 * Validates the given theme and changes it to the predefined standard fallback theme if needed.
+	 *
+	 * An SAP standard theme is considered invalid when it is either:
+	 *   - not available anymore (deprecated & removed)
+	 *   - not yet available (meaning: released in future versions)
+	 *
+	 * Invalid themes will be defaulted to the predetermined standard default theme.
+	 *
+	 * Themes for which a theme root exists are expected to be served from their given origin
+	 * and will not be adapted.
+	 *
+	 * @param {string} sTheme the theme to be validated
+	 * @param {string|null} sThemeRoot the theme root url for the given theme
+	 * @returns {string} the validated and transformed theme name
+	 */
+	ThemeHelper.validateAndFallbackTheme = function(sTheme, sThemeRoot) {
+		// check cache for already determined fallback
+		// only do this for themes from the default location (potential SAP standard themes)
+		if (sThemeRoot == null && mThemeFallbacks[sTheme]) {
+			return mThemeFallbacks[sTheme];
+		}
+
+		let sNewTheme = sTheme;
+
+		// We only fallback for a very specific set of themes:
+		//  * no theme-root is given (themes from a different endpoint (i.e. theming-service) are excluded) and
+		//  * the given theme is a standard SAP theme ('sap_' prefix)
+		//  * not supported in this version
+		if (sThemeRoot == null && sTheme.startsWith("sap_") && aKnownThemes.indexOf(sTheme) == -1) {
+			// extract the theme variant if given: "_hcb", "_hcw", "_dark"
+			const aThemeMatch = rThemePattern.exec(sTheme) || [];
+			const sVariant = aThemeMatch[2]; //match includes an underscore
+
+			if (sVariant) {
+				sNewTheme = `${DEFAULT_THEME}${sVariant}`;
+			} else {
+				sNewTheme = DEFAULT_THEME;
+			}
+
+			mThemeFallbacks[sTheme] = sNewTheme;
+
+			Log.warning(`The configured theme '${sTheme}' is not yet or no longer supported in this version. The valid fallback theme is '${sNewTheme}'.`, "Theming");
+		}
+
+		return sNewTheme;
+	};
+
+	ThemeHelper.getDefaultThemeInfo = function() {
+		return {
+			DEFAULT_THEME: DEFAULT_THEME,
+			DARK_MODE: bDarkMode
+		};
+	};
+
 	return ThemeHelper;
 });

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

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * Helper class used by the UI5 Core to check whether the themes are applied correctly.
 	 *
 	 * It could happen that e.g. in onAfterRendering not all themes are available. In these cases the
-	 * check waits until the CSS is applied and fires an onThemeChanged event.
+	 * check waits until the CSS is applied and fires an onThemeApplied event.
 	 *
 	 * @namespace
 	 * @author SAP SE
@@ -74,11 +74,11 @@ sap.ui.define([
 		 * @private
 		 * @ui5-restricted sap.ui.core
 		 */
-		checkThemeChanged : function() {
+		checkThemeApplied : function() {
 			ThemeManager.reset();
 			delayedCheckTheme(true);
 			if (!_sThemeCheckId) {
-				ThemeManager.fireThemeChanged();
+				ThemeManager.fireThemeApplied();
 			}
 		},
 
@@ -148,17 +148,18 @@ sap.ui.define([
 
 			// include the stylesheet for the library (except for "classic" and "legacy" lib)
 			if ((sLibName != "sap.ui.legacy") && (sLibName != "sap.ui.classic")) {
-				var oGetCssVariablesParam = {
+				var sCssVariablesParam = BaseConfig.get({
 					name: "sapUiXxCssVariables",
-					type: BaseConfig.Type.Boolean
-				};
+					type: BaseConfig.Type.String,
+					external: true
+				});
 
 				// no variant?
 				if (!sVariant) {
 					sVariant = "";
 				}
 				// determine CSS Variables / RTL
-				var sCssVars = BaseConfig.get(oGetCssVariablesParam) ? "_skeleton" : "";
+				var sCssVars = /^(true|x)$/i.test(sCssVariablesParam) ? "_skeleton" : "";
 				var sRtl = (Localization.getRTL() ? "-RTL" : "");
 
 				// create the library file name
@@ -172,30 +173,28 @@ sap.ui.define([
 				}
 
 				var sLinkId = "sap-ui-theme-" + sLibId;
-				var sOldCssUri = document.getElementById(sLinkId) && document.getElementById(sLinkId).href;
-				var sCssBasePath = new URL(ThemeManager._getThemePath(sLibName, Theming.getTheme()), document.baseURI).toString();
-				// Create a link tag and set the URL as href in order to ensure AppCacheBuster handling.
-				// AppCacheBuster ID is added to the href by defineProperty for the "href" property of
-				// HTMLLinkElement in AppCacheBuster.js
-				// Note: Considered to use AppCacheBuster.js#convertURL for adding the AppCachebuster ID
-				//       but there would be a dependency to AppCacheBuster as trade-off
-				var oTmpLink = document.createElement("link");
-				oTmpLink.href = sCssBasePath + sLibFileName + ".css" + (sQuery ? sQuery : "");
-				var sCssPathAndName = oTmpLink.href;
-				oTmpLink.href = sCssBasePath + "css_variables.css" + (sQuery ? sQuery : "");
-				var sCssVariablesPathAndName = oTmpLink.href;
-
-				// includeStylesheet takes care of adding link tag for library only once but we need to take care to skip
-				// checkThemeChanged in case the link tag does not change in order to avoid fireThemeChanged
-				if (!(sCssPathAndName === sOldCssUri || sCssVariablesPathAndName === sOldCssUri)) {
+				var sSkeletonLinkId = "sap-ui-themeskeleton-" + sLibId;
+				var bCssVariables = /^(true|x|additional)$/i.test(sCssVariablesParam);
+				if (!document.querySelector("LINK[id='" + sLinkId + "']") || (bCssVariables && !document.querySelector("LINK[id='" + sSkeletonLinkId + "']"))) {
+					var sCssBasePath = new URL(ThemeManager._getThemePath(sLibName, Theming.getTheme()), document.baseURI).toString();
+					// Create a link tag and set the URL as href in order to ensure AppCacheBuster handling.
+					// AppCacheBuster ID is added to the href by defineProperty for the "href" property of
+					// HTMLLinkElement in AppCacheBuster.js
+					// Note: Considered to use AppCacheBuster.js#convertURL for adding the AppCachebuster ID
+					//       but there would be a dependency to AppCacheBuster as trade-off
+					var oTmpLink = document.createElement("link");
+					oTmpLink.href = sCssBasePath + sLibFileName + ".css" + (sQuery ? sQuery : "");
+					var sCssPathAndName = oTmpLink.href;
+					oTmpLink.href = sCssBasePath + "css_variables.css" + (sQuery ? sQuery : "");
+					var sCssVariablesPathAndName = oTmpLink.href;
+
 					// use the special FOUC handling for initially existing stylesheets
 					// to ensure that they are not just replaced when using the
 					// includeStyleSheet API and to be removed later
 					fnAddFoucmarker(sLinkId);
 
 					// include the css variables
-					oGetCssVariablesParam.type = BaseConfig.Type.String;
-					if (/^(true|x|additional)$/i.test(BaseConfig.get(oGetCssVariablesParam))) {
+					if (bCssVariables) {
 						Log.info("Including " + sCssVariablesPathAndName + " -  sap.ui.core.theming.ThemeManager.includeLibraryTheme()");
 						includeStylesheet(sCssVariablesPathAndName, sLinkId);
 						// include the skeleton css next to the css variables
@@ -212,7 +211,7 @@ sap.ui.define([
 					if (Parameters) {
 						Parameters._addLibraryTheme(sLibId);
 					}
-					ThemeManager.checkThemeChanged();
+					ThemeManager.checkThemeApplied();
 				}
 			}
 		},
@@ -257,7 +256,8 @@ sap.ui.define([
 		 * @private
 		 * @ui5-restricted sap.ui.core
 		 */
-		fireThemeChanged: function () {
+		fireThemeApplied: function () {
+			ThemeHelper.reset();
 			// special hook for resetting theming parameters before the controls get
 			// notified (lightweight coupling to static Parameters module)
 			var ThemeParameters = sap.ui.require("sap/ui/core/theming/Parameters");
@@ -265,7 +265,7 @@ sap.ui.define([
 				ThemeParameters._reset(/* bOnlyWhenNecessary= */ true);
 			}
 
-			ThemeManager.fireEvent("ThemeChanged", {
+			ThemeManager.fireEvent("applied", {
 				theme: Theming.getTheme()
 			});
 		}
@@ -500,7 +500,7 @@ sap.ui.define([
 		} else if (!bFirst) {
 			ThemeManager.reset();
 			ThemeManager.themeLoaded = true;
-			ThemeManager.fireThemeChanged();
+			ThemeManager.fireThemeApplied();
 			if (bEmergencyExit) {
 				Log.error("ThemeManager: max. check cycles reached.");
 			}
@@ -548,7 +548,7 @@ sap.ui.define([
 		html.classList.add("sapUiTheme-" + sTheme);
 
 		// notify the listeners
-		ThemeManager.checkThemeChanged();
+		ThemeManager.checkThemeApplied();
 	}
 
 
@@ -614,7 +614,8 @@ sap.ui.define([
 			sLibFileName = sStandardLibFilePrefix + sRTL + ".css";
 		}
 
-		sHref = ThemeManager._getThemePath(sLibName, sThemeName) + sLibFileName + sQuery;
+		// Transform to URL in order to ensure comparison against the fully resolved URL
+		sHref = new URL(ThemeManager._getThemePath(sLibName, sThemeName) + sLibFileName + sQuery, document.baseURI).toString();
 		if ( sHref != oLink.href ) {
 			// sap/ui/dom/includeStylesheet has a special FOUC handling
 			// which is activated once the attribute data-sap-ui-foucmarker is

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.117.1
+	 * @version 1.119.0
 	 *
 	 * @public
 	 * @since 1.15

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * Represents a DOM element. It allows to use databinding for the properties and nested DOM attributes.
 	 * @extends sap.ui.core.Control
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @public
 	 * @since 1.15

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.tmpl.Template
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @alias sap.ui.core.tmpl.HandlebarsTemplate
 	 * @since 1.15
 	 * @deprecated since 1.56

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

@@ -54,7 +54,7 @@ function(
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @alias sap.ui.core.tmpl.Template
 	 * @since 1.15
 	 * @deprecated since 1.56, use an {@link sap.ui.core.mvc.XMLView XMLView} or a {@link topic:e6bb33d076dc4f23be50c082c271b9f0 Typed View} instead.

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

@@ -8,6 +8,7 @@
 sap.ui.define([
 	'sap/ui/core/Control',
 	'sap/ui/core/DeclarativeSupport',
+	"sap/ui/core/Element",
 	'sap/ui/core/UIArea',
 	'./DOMElement',
 	"./TemplateControlRenderer",
@@ -21,6 +22,7 @@ sap.ui.define([
 	function(
 		Control,
 		DeclarativeSupport,
+		Element,
 		UIArea,
 		DOMElement,
 		TemplateControlRenderer,
@@ -43,7 +45,7 @@ sap.ui.define([
 	 * @class
 	 * This is the base class for all template controls. Template controls are declared based on templates.
 	 * @extends sap.ui.core.Control
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @public
 	 * @since 1.15
@@ -194,7 +196,7 @@ sap.ui.define([
 	 * @private
 	 */
 	TemplateControl.prototype._compile = function() {
-		var oTemplate = sap.ui.getCore().byId(this.getTemplate()),
+		var oTemplate = Element.getElementById(this.getTemplate()),
 			bDeclarativeSupport = oTemplate && oTemplate.getDeclarativeSupport();
 		if (bDeclarativeSupport) {
 			var that = this;

package/src/sap/ui/core/util/AsyncHintsHelper.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @class Utility class for asyncHints
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ushell

package/src/sap/ui/core/util/Export.js

@@ -141,7 +141,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportCell.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportColumn.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportRow.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportType.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/ManagedObject'],
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportTypeCSV.js

@@ -38,7 +38,7 @@ sap.ui.define(['./ExportType'],
 	 * @extends sap.ui.core.util.ExportType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/File.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/thirdparty/jquery"],
 	 * Utility class to handle files.
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @namespace
 	 *
 	 * @public

package/src/sap/ui/core/util/LibraryInfo.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @private
 	 * @alias sap.ui.core.util.LibraryInfo
 	 */

package/src/sap/ui/core/util/MockServer.js

@@ -33,7 +33,7 @@ sap.ui
 			 * @extends sap.ui.base.ManagedObject
 			 * @abstract
 			 * @author SAP SE
-			 * @version 1.117.1
+			 * @version 1.119.0
 			 * @public
 			 * @alias sap.ui.core.util.MockServer
 			 */

package/src/sap/ui/core/util/PasteHelper.js

@@ -13,7 +13,7 @@ sap.ui.define([ "sap/ui/core/Core", "sap/ui/model/ParseException", "sap/ui/model
 	 *
 	 * @class Parses and validates data on the <code>paste</code> event of an SAPUI5 table.
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.table.Table, sap.m.Table, sap.m.plugins.PasteProvider
 	 * @alias sap.ui.core.util.PasteHelper

package/src/sap/ui/core/util/XMLPreprocessor.js

@@ -1107,43 +1107,67 @@ sap.ui.define([
 			 */
 			function getResolvedBinding(sValue, oElement, oWithControl, bMandatory,
 					fnCallIfConstant) {
-				var vBindingInfo,
-					oPromise;
+				let vParseResult;
 
-				Measurement.average(sPerformanceGetResolvedBinding, "", aPerformanceCategories);
-				try {
-					vBindingInfo
-						= BindingParser.complexParser(sValue, oScope, bMandatory, true, true, true)
-						|| sValue; // in case there is no binding and nothing to unescape
-				} catch (e) {
-					return SyncPromise.reject(e);
-				}
+				function resolveBinding (vBindingInfo) {
+					let oPromise;
 
-				if (vBindingInfo.functionsNotFound) {
-					if (bMandatory) {
-						warn(oElement, 'Function name(s)',
-							vBindingInfo.functionsNotFound.join(", "), 'not found');
+					if (vBindingInfo.functionsNotFound) {
+						if (bMandatory) {
+							warn(oElement, 'Function name(s)',
+								vBindingInfo.functionsNotFound.join(", "), 'not found');
+						}
+						Measurement.end(sPerformanceGetResolvedBinding);
+						return null; // treat incomplete bindings as unrelated
+					}
+
+					if (typeof vBindingInfo === "object") {
+						oPromise = getAny(oWithControl, vBindingInfo, mSettings, oScope,
+							!oViewInfo.sync);
+						if (bMandatory && !oPromise) {
+							warn(oElement, 'Binding not ready');
+						} else if (oViewInfo.sync && oPromise && oPromise.isPending()) {
+							error("Async formatter in sync view in " + sValue + " of ", oElement);
+						}
+					} else {
+						oPromise = SyncPromise.resolve(vBindingInfo);
+						if (fnCallIfConstant) { // string
+							fnCallIfConstant();
+						}
 					}
 					Measurement.end(sPerformanceGetResolvedBinding);
-					return null; // treat incomplete bindings as unrelated
+
+					return oPromise;
 				}
 
-				if (typeof vBindingInfo === "object") {
-					oPromise = getAny(oWithControl, vBindingInfo, mSettings, oScope,
-						!oViewInfo.sync);
-					if (bMandatory && !oPromise) {
-						warn(oElement, 'Binding not ready');
-					} else if (oViewInfo.sync && oPromise && oPromise.isPending()) {
-						error("Async formatter in sync view in " + sValue + " of ", oElement);
-					}
-				} else {
-					oPromise = SyncPromise.resolve(vBindingInfo);
-					if (fnCallIfConstant) { // string
-						fnCallIfConstant();
+				Measurement.average(sPerformanceGetResolvedBinding, "", aPerformanceCategories);
+				if (oViewInfo.sync) {
+					try {
+						vParseResult
+						= BindingParser.complexParser(sValue, oScope, bMandatory, true, true, true)
+							|| sValue; // in case there is no binding and nothing to unescape
+					} catch (e) {
+						return SyncPromise.reject(e);
 					}
+					return resolveBinding(vParseResult);
+				}
+
+				try {
+					vParseResult
+						= BindingParser.complexParser(sValue, oScope, bMandatory, true, true, true,
+							null, true);
+				} catch (e) {
+					return SyncPromise.reject(e);
 				}
-				Measurement.end(sPerformanceGetResolvedBinding);
-				return oPromise;
+				if (!vParseResult) { // no binding and nothing to unescape
+					return resolveBinding(sValue);
+				}
+				if (!vParseResult.wait) { // nothing to wait for
+					return resolveBinding(vParseResult.bindingInfo);
+				}
+				return vParseResult.resolved.then(function (/*no results*/) {
+					return resolveBinding(vParseResult.bindingInfo);
+				});
 			}
 
 			/**