@openui5/sap.ui.core 1.118.0 → 1.119.1

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,7 +8,6 @@ sap.ui.define([
 ], function (Log) {
 	"use strict";
 
-	// TODO reset map onThemeChanged
 	var mLibThemeMetadata = {};
 
 

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
@@ -173,7 +174,7 @@ sap.ui.define([
 
 				var sLinkId = "sap-ui-theme-" + sLibId;
 				var sSkeletonLinkId = "sap-ui-themeskeleton-" + sLibId;
-				var bCssVariables = /^(true|x|additional)$/i.test(BaseConfig.get(oGetCssVariablesParam));
+				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.
@@ -193,7 +194,6 @@ sap.ui.define([
 					fnAddFoucmarker(sLinkId);
 
 					// include the css variables
-					oGetCssVariablesParam.type = BaseConfig.Type.String;
 					if (bCssVariables) {
 						Log.info("Including " + sCssVariablesPathAndName + " -  sap.ui.core.theming.ThemeManager.includeLibraryTheme()");
 						includeStylesheet(sCssVariablesPathAndName, sLinkId);
@@ -211,7 +211,7 @@ sap.ui.define([
 					if (Parameters) {
 						Parameters._addLibraryTheme(sLibId);
 					}
-					ThemeManager.checkThemeChanged();
+					ThemeManager.checkThemeApplied();
 				}
 			}
 		},
@@ -256,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");
@@ -264,7 +265,7 @@ sap.ui.define([
 				ThemeParameters._reset(/* bOnlyWhenNecessary= */ true);
 			}
 
-			ThemeManager.fireEvent("ThemeChanged", {
+			ThemeManager.fireEvent("applied", {
 				theme: Theming.getTheme()
 			});
 		}
@@ -499,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.");
 			}
@@ -547,7 +548,7 @@ sap.ui.define([
 		html.classList.add("sapUiTheme-" + sTheme);
 
 		// notify the listeners
-		ThemeManager.checkThemeChanged();
+		ThemeManager.checkThemeApplied();
 	}
 
 

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.118.0
+	 * @version 1.119.1
 	 *
 	 * @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.118.0
+	 * @version 1.119.1
 	 *
 	 * @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.118.0
+	 * @version 1.119.1
 	 * @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.118.0
+	 * @version 1.119.1
 	 * @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.118.0
+	 * @version 1.119.1
 	 *
 	 * @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.118.0
+	 * @version 1.119.1
 	 *
 	 * @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.118.0
+	 * @version 1.119.1
 	 * @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.118.0
+	 * @version 1.119.1
 	 * @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.118.0
+	 * @version 1.119.1
 	 * @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.118.0
+	 * @version 1.119.1
 	 * @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.118.0
+	 * @version 1.119.1
 	 * @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.118.0
+	 * @version 1.119.1
 	 * @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.118.0
+	 * @version 1.119.1
 	 * @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.118.0
+	 * @version 1.119.1
 	 * @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.118.0
+			 * @version 1.119.1
 			 * @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.118.0
+	 * @version 1.119.1
 	 * @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/reflection/BaseTreeModifier.js

@@ -736,6 +736,25 @@ sap.ui.define([
 		 */
 		removeAggregation: function (vParent, sAggregationName, oObject) {},
 
+		/**
+		 * Removes the object from an aggregation of the source control and places it into an aggregation of the target control.
+		 * This method is basically a removeAggregation followed by an insertAggregation, but the execution of both steps is
+		 * done synchronously, avoiding issues with having elements without parents in asynchronous processes. The entire process
+		 * is however asynchronous like other modifier actions.
+		 *
+		 * @param {sap.ui.base.ManagedObject|Element} vSourceParent - Control representation of the source parent
+		 * @param {string} sSourceAggregationName - Source aggregation name
+		 * @param {sap.ui.base.ManagedObject|Element} vTargetParent - Control representation of the target parent
+		 * @param {string} sTargetAggregationName - Target aggregation name
+		 * @param {sap.ui.base.ManagedObject|Element} oObject - Aggregated object to be moved
+		 * @param {int} iIndex - Index for <code>oObject</code> in the target aggregation
+		 * @param {Element} [oView] - XML node of the view, needed in XML case to potentially create (aggregation) nodes
+		 * @param {boolean} [bSkipAdjustIndex] - true in case of inserting an XML node or element at an extension point, needed only in XML case
+		 * @returns {Promise} resolves when async processing is done
+		 * @public
+		 */
+		moveAggregation: function (vSourceParent, sSourceAggregationName, vTargetParent, sTargetAggregationName, oObject, iIndex, oView, bSkipAdjustIndex) {},
+
 		/**
 		 * Removes all objects from the aggregation of the given control.
 		 * See {@link sap.ui.base.ManagedObject#removeAllAggregation} method.
@@ -910,26 +929,30 @@ sap.ui.define([
 
 		/**
 		 * Attaches event on the specified <code>ManagedObject</code>.
+		 * To not rely on globals the function has to be passed in addition to the path.
 		 *
 		 * @param {sap.ui.base.ManagedObject|Element} vControl - Control representation
 		 * @param {string} sEventName - Event name
 		 * @param {string} sFunctionPath - Absolute path to a function
 		 * @param {object} vData - Predefined values for event handler function
-		 * @returns {Promise} resolves when async processing is done
+		 * @param {function} fnCallback - Callback function that is located at the function path
+		 * @returns {Promise} Resolves when async processing is done
 		 * @public
 		 */
-		attachEvent: function(vControl, sEventName, sFunctionPath, vData) {},
+		attachEvent: function(vControl, sEventName, sFunctionPath, vData, fnCallback) {},
 
 		/**
 		 * Detaches event from the specified ManagedObject.
+		 * To not rely on globals the function has to be passed in addition to the path.
 		 *
 		 * @param {sap.ui.base.ManagedObject|Element} vControl - Control representation
 		 * @param {string} sEventName - Event name
 		 * @param {string} sFunctionPath - Absolute path to a function
-		 * @returns {Promise} resolves when async processing is done
+		 * @param {function} fnCallback - Callback function that is located at the function path
+		 * @returns {Promise} Resolves when async processing is done
 		 * @public
 		 */
-		detachEvent: function(vControl, sEventName, sFunctionPath) {},
+		detachEvent: function(vControl, sEventName, sFunctionPath, fnCallback) {},
 
 		/**
 		 * Returns an object containing parent control, aggregation name and index for controls to be added of the given extension point.

package/src/sap/ui/core/util/reflection/JsControlTreeModifier.js

@@ -13,6 +13,7 @@ sap.ui.define([
 	"sap/base/util/ObjectPath",
 	"sap/ui/util/XMLHelper",
 	"sap/base/util/merge",
+	"sap/ui/core/Element",
 	"sap/ui/core/Fragment"
 ], function (
 	BindingParser,
@@ -21,10 +22,10 @@ sap.ui.define([
 	ObjectPath,
 	XMLHelper,
 	merge,
+	Element,
 	Fragment
 ) {
 
-
 	"use strict";
 	/**
 	 * Static utility class to access ManagedObjects in a harmonized way with XMLNodes.
@@ -263,7 +264,7 @@ sap.ui.define([
 		 * @inheritDoc
 		 */
 		_byId: function (sId) {
-			return sap.ui.getCore().byId(sId);
+			return Element.getElementById(sId);
 		},
 
 		/**
@@ -333,39 +334,65 @@ sap.ui.define([
 		/**
 		 * @inheritDoc
 		 */
-		insertAggregation: function (oParent, sName, oObject, iIndex) {
+		insertAggregation: async function (oParent, sName, oObject, iIndex) {
 			//special handling without invalidation for customData
 			if (sName === "customData") {
-				return oParent.insertAggregation(sName, oObject, iIndex, /*bSuppressInvalidate=*/true);
+				oParent.insertAggregation(sName, oObject, iIndex, /*bSuppressInvalidate=*/true);
+				return;
+			}
+			const oAggregation = await this.findAggregation(oParent, sName);
+			if (oAggregation) {
+				if (oAggregation.multiple) {
+					const iInsertIndex = iIndex || 0;
+					oParent[oAggregation._sInsertMutator](oObject, iInsertIndex);
+				} else {
+					oParent[oAggregation._sMutator](oObject);
+				}
 			}
-			return this.findAggregation(oParent, sName)
-				.then(function (oAggregation) {
-					if (oAggregation) {
-						if (oAggregation.multiple) {
-							var iInsertIndex = iIndex || 0;
-							oParent[oAggregation._sInsertMutator](oObject, iInsertIndex);
-						} else {
-							oParent[oAggregation._sMutator](oObject);
-						}
-					}
-				});
 		},
 
 		/**
 		 * @inheritDoc
 		 */
-		removeAggregation: function (oControl, sName, oObject) {
+		removeAggregation: async function (oParent, sName, oObject) {
 			//special handling without invalidation for customData
 			if (sName === "customData") {
-				oControl.removeAggregation(sName, oObject, /*bSuppressInvalidate=*/true);
-				return Promise.resolve();
+				oParent.removeAggregation(sName, oObject, /*bSuppressInvalidate=*/true);
+				return;
+			}
+			const oAggregation = await this.findAggregation(oParent, sName);
+			if (oAggregation) {
+				oParent[oAggregation._sRemoveMutator](oObject);
+			}
+		},
+
+		/**
+		 * @inheritDoc
+		 */
+		moveAggregation: async function(oSourceParent, sSourceAggregationName, oTargetParent, sTargetAggregationName, oObject, iIndex) {
+			let oSourceAggregation;
+			let oTargetAggregation;
+
+			// customData aggregations are always multiple and use the standard "removeAggregation" mutator
+			if (sSourceAggregationName === "customData") {
+				oSourceParent.removeAggregation(sSourceAggregationName, oObject, /*bSuppressInvalidate=*/true);
+			} else {
+				oSourceAggregation = await this.findAggregation(oSourceParent, sSourceAggregationName);
+			}
+			if (sTargetAggregationName === "customData") {
+				oTargetParent.insertAggregation(sTargetAggregationName, oObject, iIndex, /*bSuppressInvalidate=*/true);
+			} else {
+				oTargetAggregation = await this.findAggregation(oTargetParent, sTargetAggregationName);
+			}
+
+			if (oSourceAggregation && oTargetAggregation) {
+				oSourceParent[oSourceAggregation._sRemoveMutator](oObject);
+				if (oTargetAggregation.multiple) {
+					oTargetParent[oTargetAggregation._sInsertMutator](oObject, iIndex);
+				} else {
+					oTargetParent[oTargetAggregation._sMutator](oObject);
+				}
 			}
-			return this.findAggregation(oControl, sName)
-				.then(function (oAggregation) {
-					if (oAggregation) {
-						oControl[oAggregation._sRemoveMutator](oObject);
-					}
-				});
 		},
 
 		/**
@@ -532,11 +559,10 @@ sap.ui.define([
 		/**
 		 * @inheritDoc
 		 */
-		attachEvent: function (oObject, sEventName, sFunctionPath, vData) {
+		attachEvent: function (oObject, sEventName, sFunctionPath, vData, fnCallback) {
 			return new Promise(function (fnResolve, fnReject) {
-				var fnCallback = ObjectPath.get(sFunctionPath);
 				if (typeof fnCallback !== "function") {
-					fnReject(new Error("Can't attach event because the event handler function is not found or not a function."));
+					fnReject(new Error("Can't attach event: fnCallback parameter missing or not a function"));
 				}
 				fnResolve(oObject.attachEvent(sEventName, vData, fnCallback));
 			});
@@ -545,11 +571,10 @@ sap.ui.define([
 		/**
 		 * @inheritDoc
 		 */
-		detachEvent: function (oObject, sEventName, sFunctionPath) {
+		detachEvent: function (oObject, sEventName, sFunctionPath, fnCallback) {
 			return new Promise(function (fnResolve, fnReject) {
-				var fnCallback = ObjectPath.get(sFunctionPath);
 				if (typeof fnCallback !== "function") {
-					fnReject(new Error("Can't attach event because the event handler function is not found or not a function."));
+					fnReject(new Error("Can't detach event: fnCallback parameter missing or not a function"));
 				}
 				// EventProvider.detachEvent doesn't accept vData parameter, therefore it might lead
 				// to a situation when an incorrect event listener is detached.