@openui5/sap.ui.core 1.93.3 → 1.96.2

package/src/sap/ui/model/type/DateInterval.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 
 sap.ui.define([
 	'sap/ui/core/format/DateFormat',
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.
@@ -216,6 +216,8 @@ sap.ui.define([
 							aViolatedConstraints.push("maximum");
 							aMessages.push(oBundle.getText("Date.Maximum", [oCompareValue]));
 						}
+						break;
+					default: break;
 				}
 			}.bind(this));
 

package/src/sap/ui/model/type/DateTime.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	function(Date, DateFormat) {
@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	function(DateInterval, DateFormat) {
@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/FileSize.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides class sap.ui.model.type.FileSize
 sap.ui.define([
 	"sap/base/util/each",
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] formatting options. Supports the same options as {@link sap.ui.core.format.FileSizeFormat.getInstance FileSizeFormat.getInstance}
@@ -145,6 +145,8 @@ sap.ui.define([
 							aViolatedConstraints.push("maximum");
 							aMessages.push(oBundle.getText("FileSize.Maximum", [oContent]));
 						}
+						break;
+					default: break;
 				}
 			});
 			if (aViolatedConstraints.length > 0) {

package/src/sap/ui/model/type/Float.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define([
 	"sap/base/util/each",
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.NumberFormat NumberFormat}.
@@ -121,6 +121,8 @@ sap.ui.define([
 							aMessages.push(oBundle.getText("Float.Maximum",
 								[that.oOutputFormat.format(oContent)]));
 						}
+						break;
+					default: break;
 				}
 			});
 			if (aViolatedConstraints.length > 0) {

package/src/sap/ui/model/type/Integer.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define([
 	"sap/base/util/each",
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.NumberFormat NumberFormat}.
@@ -124,6 +124,8 @@ sap.ui.define([
 							aMessages.push(oBundle.getText("Integer.Maximum",
 								[that.oOutputFormat.format(oContent)]));
 						}
+						break;
+					default: break;
 				}
 			});
 			if (aViolatedConstraints.length > 0) {

package/src/sap/ui/model/type/String.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define([
 	"sap/base/Log",
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Time.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	function(Date, DateFormat) {
@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	function(DateInterval, DateFormat) {
@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/Unit.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define([
 	"sap/base/strings/hash",
@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -97,8 +97,10 @@ sap.ui.define([
 	 * If a Unit is already known during formatting, we also pass it along to construct
 	 * an optimal NumberFormat instance.
 	 *
-	 * @param {*} aArgs an array containing the parsed dynamic format options
-	 * @param {*} sUnitToBeFormatted
+	 * @param {any[]} aArgs An array containing the parsed dynamic format options
+	 * @param {string} sUnitToBeFormatted The name of the unit to be formatted
+	 *
+	 * @return {sap.ui.core.format.NumberFormat} The new NumberFormat instance
 	 */
 	Unit.prototype._getInstance = function(aArgs, sUnitToBeFormatted) {
 		var oFormatArgs = this.createFormatOptions(aArgs);
@@ -180,9 +182,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Extracts arguments from the given value
-	 * @param vValue
-	 * @returns {Array}
+	 * Extracts arguments from the given value.
+	 *
+	 * @param {any} vValue
+	 *   The value to extract parameters from
+	 * @returns {any[]}
+	 *   Returns a copy of the given value starting with the third entry if the given value is an
+	 *   array; returns an empty array otherwise
 	 */
 	Unit.prototype.extractArguments = function(vValue) {
 		return Array.isArray(vValue) && vValue.length > 2 ? vValue.slice(2) : [];
@@ -308,6 +314,7 @@ sap.ui.define([
 							aMessages.push(oBundle.getText("Unit.Decimals", [oContent]));
 						}
 						break;
+					default: break;
 				}
 			});
 			if (aViolatedConstraints.length > 0) {

package/src/sap/ui/model/xml/XMLListBinding.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the XML model implementation of a list binding
 sap.ui.define([
 	'sap/ui/model/ChangeReason',
@@ -83,8 +83,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the entry data as required for change detection/diff. For the XMLModel this is the node
-	 * referenced by the context, serialized as XML.
+	 * Returns the entry data as required for change detection/diff. For the XMLModel this is the
+	 * node referenced by the context, serialized as XML.
+	 *
+	 * @param {sap.ui.model.Context} oContext The context to get the entry data from
+	 *
+	 * @returns {string} The entry data of the given context
 	 *
 	 * @private
 	 */
@@ -120,23 +124,23 @@ sap.ui.define([
 	};
 
 	/**
-	 * Check whether this Binding would provide new values and in case it changed,
-	 * inform interested parties about this.
+	 * Checks whether this Binding would provide new values and in case it changed, fires a change
+	 * event with change reason <code>Change</code>.
 	 *
 	 * @param {boolean} bForceupdate
+	 *   Whether the change event is fired regardless of the binding's state
 	 *
 	 */
 	XMLListBinding.prototype.checkUpdate = function(bForceupdate){
+		var oList;
 
 		if (this.bSuspended && !this.bIgnoreSuspend && !bForceupdate) {
 			return;
 		}
 
 		if (!this.bUseExtendedChangeDetection) {
-			var oList = this.oModel._getObject(this.sPath, this.oContext) || [];
+			oList = this.oModel._getObject(this.sPath, this.oContext) || [];
 			if (oList.length != this.oList.length || bForceupdate) {
-				// TODO does not work currently, so so old behavior
-				//if (!jQuery.sap.equal(this.oList, oList)) {
 				this.update();
 				this._fireChange({reason: ChangeReason.Change});
 			}
@@ -145,7 +149,7 @@ sap.ui.define([
 			var that = this;
 
 			//If the list has changed we need to update the indices first
-			var oList = this.oModel._getObject(this.sPath, this.oContext) || [];
+			oList = this.oModel._getObject(this.sPath, this.oContext) || [];
 			if (this.oList.length != oList.length) {
 				bChangeDetected = true;
 			}
@@ -165,6 +169,8 @@ sap.ui.define([
 							bChangeDetected = true;
 							return false;
 						}
+
+						return true;
 					});
 				}
 			} else {

package/src/sap/ui/model/xml/XMLModel.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 /**
  * XML-based DataBinding
  *
@@ -40,12 +40,14 @@ sap.ui.define([
 	 * Constructor for a new XMLModel.
 	 *
 	 * @class
-	 * Model implementation for XML format
+	 * Model implementation for the XML format.
+	 *
+	 * This model is not prepared to be inherited from.
 	 *
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @param {object} oData either the URL where to load the XML from or an XML
 	 * @public
@@ -91,7 +93,7 @@ sap.ui.define([
 	/**
 	 * Serializes the current XML data of the model into a string.
 	 *
-	 * @return the XML document serialized as string
+	 * @return {string} The XML document serialized as string
 	 * @public
 	 */
 	XMLModel.prototype.getXML = function(){
@@ -165,8 +167,8 @@ sap.ui.define([
 	/**
 	 * Sets an XML namespace to use in the binding path
 	 *
-	 * @param {string} sNameSpace the namespace URI
-	 * @param {string} [sPrefix=null] the prefix for the namespace (optional)
+	 * @param {string} sNameSpace The namespace URI
+	 * @param {string} [sPrefix] The prefix for the namespace
 	 * @public
 	 */
 	XMLModel.prototype.setNameSpace = function(sNameSpace, sPrefix){
@@ -207,11 +209,17 @@ sap.ui.define([
 	 * Sets a new value for the given property <code>sPropertyName</code> in the model.
 	 * If the model value changed all interested parties are informed.
 	 *
-	 * @param {string}  sPath path of the property to set
-	 * @param {any}     oValue value to set the property to
-	 * @param {object} [oContext=null] the context which will be used to set the property
-	 * @param {boolean} [bAsyncUpdate] whether to update other bindings dependent on this property asynchronously
-	 * @return {boolean} true if the value was set correctly and false if errors occurred like the entry was not found.
+	 * @param {string} sPath
+	 *   Path of the property to set
+	 * @param {any} oValue
+	 *   Value to set the property to
+	 * @param {object} [oContext]
+	 *   The context which will be used to set the property
+	 * @param {boolean} [bAsyncUpdate]
+	 *   Whether to update other bindings dependent on this property asynchronously
+	 *
+	 * @return {boolean}
+	 *   Whether the value was set correctly
 	 * @public
 	 */
 	XMLModel.prototype.setProperty = function(sPath, oValue, oContext, bAsyncUpdate) {
@@ -248,14 +256,14 @@ sap.ui.define([
 	};
 
 	/**
-	* Returns the value for the property with the given <code>sPropertyName</code>
-	*
-	* @param {string} sPath the path to the property
-	* @param {object} [oContext=null] the context which will be used to retrieve the property
-	* @type any
-	* @return the value of the property
-	* @public
-	*/
+	 * Returns the value for the property with the given <code>sPropertyName</code>.
+	 *
+	 * @param {string} sPath The path to the property
+	 * @param {object} [oContext] The context which will be used to retrieve the property
+	 *
+	 * @return {string} The value of the property
+	 * @public
+	 */
 	XMLModel.prototype.getProperty = function(sPath, oContext) {
 		var oResult = this._getObject(sPath, oContext);
 		if (oResult && typeof oResult != "string") {
@@ -265,14 +273,14 @@ sap.ui.define([
 	};
 
 	/**
-	* Returns the object for the given <code>path</code>
-	*
-	* @param {string} sPath the path to the object
-	* @param {object} [oContext=null] the context which will be used to retrieve the object
-	* @type any
-	* @return the object
-	* @public
-	*/
+	 * Returns the object for the given path and context.
+	 *
+	 * @param {string} sPath The path to the object
+	 * @param {object} [oContext] The context which will be used to retrieve the object
+	 *
+	 * @return {object} The object
+	 * @public
+	 */
 	XMLModel.prototype.getObject = function(sPath, oContext) {
 		var oObject = this._getObject(sPath, oContext);
 		if (Array.isArray(oObject)) {
@@ -282,8 +290,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * @param {string} sPath
-	 * @param {object} oContext
+	 * Returns the object for the given path and context.
+	 *
+	 * @param {string} sPath The path to the object
+	 * @param {object} [oContext] The context which will be used to retrieve the object
+	 *
 	 * @returns {any} the node of the specified path/context
 	 */
 	XMLModel.prototype._getObject = function (sPath, oContext) {
@@ -329,9 +340,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * @param {string} sPath
-	 * @param {object} oContext
-	 * @returns {any}
+	 * Returns the attribute for the given path and context.
+	 *
+	 * @param {string} oNode The node to get the attribute of
+	 * @param {object} sName The name of the attribute to return
+	 *
+	 * @returns {any} The extracted attribute
 	 */
 	XMLModel.prototype._getAttribute = function (oNode, sName) {
 		if (!this.oNameSpaces || sName.indexOf(":") == -1) {
@@ -343,9 +357,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * @param {object} oNode
-	 * @param {string} sName
-	 * @returns {any}
+	 * Retrieves the child elements of the node by their name.
+	 *
+	 * @param {object} oNode The node holding the child elements
+	 * @param {string} sName The name of the child elements
+	 *
+	 * @returns {any} The child elements matching the given name
 	 */
 	XMLModel.prototype._getChildElementsByTagName = function (oNode, sName) {
 		var aChildNodes = oNode.childNodes,
@@ -373,8 +390,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * @param {string} sName
-	 * @returns {string}
+	 * Gets the namespace for the given name.
+	 *
+	 * @param {string} sName The full name
+	 * @returns {string} The namespace for the given name
 	 */
 	XMLModel.prototype._getNameSpace = function (sName) {
 		var iColonPos = sName.indexOf(":"),
@@ -386,8 +405,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * @param {string} sName
-	 * @returns {string}
+	 * Gets the local name for the given name.
+	 *
+	 * @param {string} sName The full name
+	 *
+	 * @returns {string} The local name for the given name
 	 */
 	XMLModel.prototype._getLocalName = function (sName) {
 		var iColonPos = sName.indexOf(":"),
@@ -400,7 +422,9 @@ sap.ui.define([
 
 
 	/**
-	 * @returns {object}
+	 * Gets the namespaces of the XML document
+	 *
+	 * @returns {object} The document's namespace prefixes
 	 */
 	XMLModel.prototype._getDocNSPrefixes = function () {
 		var oPrefixes = {},
@@ -422,7 +446,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * Resolve the path relative to the given context
+	 * Resolves the path relative to the given context.
+	 *
+	 * @param {string} sPath Path to resolve
+	 * @param {sap.ui.model.Context} [oContext] Context to resolve a relative path against
+	 *
+	 * @return {string} Resolved path or undefined
 	 */
 	XMLModel.prototype._resolve = function(sPath, oContext) {
 		var bIsRelative = !sPath.startsWith("/"),

package/src/sap/ui/model/xml/XMLPropertyBinding.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the XML model implementation of a property binding
 sap.ui.define([
 	'sap/ui/model/ChangeReason',
@@ -45,11 +45,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * Check whether this Binding would provide new values and in case it changed,
-	 * inform interested parties about this.
+	 * Checks whether this Binding would provide new values and in case it changed, fires a change
+	 * event with change reason <code>sap.ui.model.ChangeReason.Change</code>.
 	 *
 	 * @param {boolean} bForceupdate
-	 *
+	 *   Whether the change event will be fired regardless of the binding's state
 	 */
 	XMLPropertyBinding.prototype.checkUpdate = function(bForceupdate){
 		if (this.bSuspended && !bForceupdate) {

package/src/sap/ui/model/xml/XMLTreeBinding.js

@@ -17,9 +17,9 @@ sap.ui.define(['sap/ui/model/ClientTreeBinding', "sap/base/util/each"],
 	 *
 	 * @param {sap.ui.model.xml.XMLModel} [oModel]
 	 * @param {string} Path pointing to the tree or array that should be bound
-	 * @param {object} [oContext=null] Context object for this binding
-	 * @param {array} [aFilters=null] Predefined filters contained in an array
-	 * @param {object} [mParameters=null] Additional model-specific parameters
+	 * @param {object} [oContext] Context object for this binding
+	 * @param {array} [aFilters] Predefined filters contained in an array
+	 * @param {object} [mParameters] Additional model-specific parameters
 	 * @protected
 	 * @alias sap.ui.model.xml.XMLTreeBinding
 	 * @extends sap.ui.model.ClientTreeBinding
@@ -68,7 +68,8 @@ sap.ui.define(['sap/ui/model/ClientTreeBinding', "sap/base/util/each"],
 				oChildContext = that.oModel.getContext(sChildPath);
 				// check if there is a filter on this level applied
 				if (that.oCombinedFilter && !that.bIsFiltering) {
-					if (that.filterInfo.aFilteredContexts && that.filterInfo.aFilteredContexts.indexOf(oChildContext) != -1) {
+					if (that.filterInfo.aFilteredContexts
+							&& that.filterInfo.aFilteredContexts.indexOf(oChildContext) != -1) {
 						aContexts.push(oChildContext);
 					}
 				} else {

package/src/sap/ui/performance/trace/Interaction.js

@@ -185,6 +185,7 @@ sap.ui.define([
 			oPendingInteraction = null;
 			oCurrentBrowserEvent = null;
 			isNavigation = false;
+			bMatched = false;
 		}
 	}
 
@@ -217,11 +218,12 @@ sap.ui.define([
 	var bInteractionActive = false,
 		bInteractionProcessed = false,
 		oCurrentBrowserEvent,
+		oBrowserElement,
+		bMatched = false,
 		iInteractionStepTimer,
 		bIdle = false,
 		bSuspended = false,
 		iInteractionCounter = 0,
-		iScrollEventDelayId = 0,
 		descScriptSrc = Object.getOwnPropertyDescriptor(HTMLScriptElement.prototype, "src");
 
 	/* As UI5 resources gets also loaded via script tags we need to
@@ -596,7 +598,6 @@ sap.ui.define([
 					} else {
 						sType = sEventId;
 					}
-
 					Interaction.start(sType, oElement);
 					oPendingInteraction = Interaction.getPending();
 
@@ -604,6 +605,13 @@ sap.ui.define([
 					if (oPendingInteraction && !oPendingInteraction.completed && Interaction.onInteractionStarted) {
 						oPendingInteraction.passportAction = Interaction.onInteractionStarted(oPendingInteraction, bForce);
 					}
+					if (oCurrentBrowserEvent) {
+						oBrowserElement = oCurrentBrowserEvent.srcControl;
+					}
+					// if browser event matches the first control event we take it for trigger/event determination (step name)
+					if (oElement && oElement.getId && oBrowserElement && oElement.getId() === oBrowserElement.getId()) {
+						bMatched = true;
+					}
 					oCurrentBrowserEvent = null;
 					//only handle the first browser event within a call stack. Ignore virtual/harmonization events.
 					bInteractionProcessed = true;
@@ -613,7 +621,26 @@ sap.ui.define([
 						oCurrentBrowserEvent = null;
 						bInteractionProcessed = false;
 					}, 0);
+				} else if (oPendingInteraction && oBrowserElement && !bMatched) {
+					// if browser event matches one of the next control events we take it for trigger/event determination (step name)
+					var elem = oBrowserElement;
+					if (elem && oElement.getId() === elem.getId()) {
+						oPendingInteraction.trigger = oElement.getId();
+						oPendingInteraction.event = sEventId;
+					    bMatched = true;
+					} else {
+						while (elem && elem.getParent()) {
+							elem = elem.getParent();
+							if (oElement.getId() === elem.getId()) {
+								oPendingInteraction.trigger = oElement.getId();
+								oPendingInteraction.event = sEventId;
+								//if we find no direct match we consider the last control event for the trigger/event (step name)
+								break;
+							}
+						}
+					}
 				}
+
 			}
 		},
 
@@ -728,19 +755,7 @@ sap.ui.define([
 		 * @private
 		 */
 		notifyScrollEvent : function(oEvent) {
-			if (bInteractionActive) {
-				// notify for a newly started interaction, but not more often than every 250ms.
-				if (!iScrollEventDelayId) {
-					Interaction.notifyEventStart(oEvent);
-				} else {
-					clearTimeout(iScrollEventDelayId);
-				}
-				iScrollEventDelayId = setTimeout(function(){
-					Interaction.notifyStepStart(oEvent.sourceElement);
-					iScrollEventDelayId = 0;
-					Interaction.notifyStepEnd();
-				}, 250);
-			}
+			/* Scrolling is disabled as it does not work properly for non user triggered scrolling */
 		},
 
 		/**