@openui5/sap.ui.core 1.99.0 → 1.100.0

package/src/sap/ui/base/Event.js

@@ -23,7 +23,7 @@ sap.ui.define(['./Object', "sap/base/assert"],
 	 * @extends sap.ui.base.Object
 	 * @implements sap.ui.base.Poolable
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @alias sap.ui.base.Event
 	 * @public
 	 */

package/src/sap/ui/base/EventProvider.js

@@ -18,7 +18,7 @@ sap.ui.define(['./Event', './Object', './ObjectPool', "sap/base/assert"],
 	 * @abstract
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @public
 	 * @alias sap.ui.base.EventProvider
 	 */

package/src/sap/ui/base/ExpressionParser.js

@@ -340,7 +340,7 @@ sap.ui.define([
 	 * and "else" clause.
 	 * @param {function} fnCondition - formatter function for the condition
 	 * @param {function} fnThen - formatter function for the "then" clause
-	 * @param {function} fnElse- formatter function for the "else" clause
+	 * @param {function} fnElse - formatter function for the "else" clause
 	 * @param {any[]} aParts - the array of binding values
 	 * @return {any} - the value of the "then" or "else" clause, depending on the value of the
 	 *   condition

package/src/sap/ui/base/Interface.js

@@ -28,7 +28,7 @@ sap.ui.define(['sap/ui/base/Object'], function(BaseObject) {
 	 * no internals of the class can be accessed.
 	 *
 	 * @author Malte Wedel, Daniel Brinkmann
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @param {sap.ui.base.Object} oObject
 	 *   Object for which a facade should be created
 	 * @param {string[]} aMethods

package/src/sap/ui/base/ManagedObject.js

@@ -266,7 +266,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @public
 	 * @alias sap.ui.base.ManagedObject
 	 */

package/src/sap/ui/base/ManagedObjectMetadata.js

@@ -73,7 +73,7 @@ function(
 	 *
 	 *
 	 * @author Frank Weigel
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @since 0.8.6
 	 * @alias sap.ui.base.ManagedObjectMetadata
 	 * @extends sap.ui.base.Metadata

package/src/sap/ui/base/ManagedObjectObserver.js

@@ -356,6 +356,7 @@ sap.ui.define([
 	/**
 	 * Called from sap.ui.base.ManagedObject if an event registration is changed.
 	 *
+	 * @param {sap.ui.base.ManagedObject} oManagedObject Object that reports a change
 	 * @param {string} sName the name of the event that changed
 	 * @param {string} sMutation "remove" or "insert"
 	 * @param {object} vListener the removed or inserted listener
@@ -379,6 +380,7 @@ sap.ui.define([
 	/**
 	 * Called from sap.ui.base.ManagedObject if a binding changed for a property or aggregation.
 	 *
+	 * @param {sap.ui.base.ManagedObject} oManagedObject Object that reports a change
 	 * @param {string} sName The name of the property or aggregation of which the binding is changed
 	 * @param {string} sMutation "prepared", "ready", "removed"
 	 * @param {object} oBindingInfo the binding info

package/src/sap/ui/base/Metadata.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @class Metadata for a class.
 	 * @author Frank Weigel
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @since 0.8.6
 	 * @public
 	 * @alias sap.ui.base.Metadata

package/src/sap/ui/base/Object.js

@@ -26,7 +26,7 @@ sap.ui.define(['./Metadata', "sap/base/Log"],
 	 * @class Base class for all SAPUI5 Objects.
 	 * @abstract
 	 * @author Malte Wedel
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @public
 	 * @alias sap.ui.base.Object
 	 * @throws {Error} When an instance of the class or its subclasses is created without the <code>new</code> operator.

package/src/sap/ui/base/ObjectPool.js

@@ -59,7 +59,7 @@ sap.ui.define(['./Object'],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @alias sap.ui.base.ObjectPool
 	 * @public
 	 */

package/src/sap/ui/core/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.99.0</version>
+  <version>1.100.0</version>
 
   <documentation>The SAPUI5 Core Runtime.
 
@@ -381,7 +381,7 @@
             <copyright>2010-2011, Christian Johansen</copyright>
             <pattern>sap/ui/thirdparty/sinon-qunit.js</pattern>
         </lib>
-        <lib name="urijs" displayName="URI.js" version="1.19.7" homepage="http://medialize.github.com/URI.js/">
+        <lib name="urijs" displayName="URI.js" version="1.19.10" homepage="http://medialize.github.com/URI.js/">
             <license url="http://opensource.org/licenses/mit-license" type="MIT" />
             <copyright>Rodney Rehm</copyright>
             <pattern>sap/ui/thirdparty/URI.js</pattern>

package/src/sap/ui/core/BusyIndicator.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * Provides methods to show or hide a waiting animation covering the whole
 	 * page and blocking user interaction.
 	 * @namespace
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @public
 	 * @alias sap.ui.core.BusyIndicator
 	 */

package/src/sap/ui/core/Component.js

@@ -228,7 +228,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @alias sap.ui.core.Component
 	 * @since 1.9.2
 	 */

package/src/sap/ui/core/ComponentContainer.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * See also {@link module:sap/ui/core/ComponentSupport}.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.ComponentContainer

package/src/sap/ui/core/ComponentMetadata.js

@@ -31,12 +31,12 @@ sap.ui.define([
 	 * Creates a new metadata object for a Component subclass.
 	 *
 	 * @param {string} sClassName Fully qualified name of the class that is described by this metadata object
-	 * @param {object} oStaticInfo Static info to construct the metadata from
+	 * @param {object} oClassInfo Static info to construct the metadata from
 	 *
 	 * @public
 	 * @class
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @since 1.9.2
 	 * @alias sap.ui.core.ComponentMetadata
 	 * @extends sap.ui.base.ManagedObjectMetadata

package/src/sap/ui/core/ComponentSupport.js

@@ -97,7 +97,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @public
 	 * @since 1.58.0
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @namespace
 	 * @alias module:sap/ui/core/ComponentSupport
 	 */

package/src/sap/ui/core/Configuration.js

@@ -1238,7 +1238,7 @@ sap.ui.define([
 		 * @returns {boolean} whether the design mode is active or not.
 		 * @since 1.13.2
 		 * @private
-		 * @ui5-restricted sap.watt, com.sap.webide
+		 * @ui5-restricted sap.watt, com.sap.webide, sap.ui.fl, sap.ui.rta, sap.ui.comp, SAP Business Application Studio
 		 */
 		getDesignMode : function() {
 			return this["xx-designMode"];
@@ -2136,6 +2136,8 @@ sap.ui.define([
 		 * </code>
 		 *
 		 * Note: To unset the custom currencies: call with <code>undefined</code>
+		 * Custom currencies must not only consist of digits but contain at least one non-digit character, e.g. "a",
+		 * so that the measure part can be distinguished from the number part.
 		 * @public
 		 * @param {object} mCurrencies currency map which is set
 		 * @returns {sap.ui.core.Configuration.FormatSettings}

package/src/sap/ui/core/Control.js

@@ -77,7 +77,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @alias sap.ui.core.Control
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/core/Core.js

@@ -210,7 +210,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @final
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @alias sap.ui.core.Core
 	 * @public
 	 * @hideconstructor
@@ -3945,6 +3945,8 @@ sap.ui.define([
 	 *
 	 * Please note that this event is a bubbling event and may already be canceled before reaching the core.
 	 *
+	 * @param {object}
+	 *            [oData] An object that will be passed to the handler along with the event object when the event is fired
 	 * @param {function}
 	 *            fnFunction The function to be called, when the event occurs
 	 * @param {object}

package/src/sap/ui/core/CustomData.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * in the documentation.
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.CustomData

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class Static class for enabling declarative UI support.
 	 *
 	 * @author Peter Muessig, Tino Butz
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @since 1.7.0
 	 * @public
 	 * @alias sap.ui.core.DeclarativeSupport

package/src/sap/ui/core/Element.js

@@ -126,7 +126,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @public
 	 * @alias sap.ui.core.Element
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel

package/src/sap/ui/core/ElementMetadata.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @since 0.8.6
 	 * @alias sap.ui.core.ElementMetadata
 	 * @extends sap.ui.base.ManagedObjectMetadata

package/src/sap/ui/core/EnabledPropagator.js

@@ -41,7 +41,7 @@ sap.ui.define([], function() {
 	 *
 	 * @param {boolean} [bDefault=true] Value that should be used as default value for the enhancement of the control.
 	 * @param {boolean} [bLegacy=false] Whether the introduced property should use the old name <code>Enabled</code>.
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @public
 	 * @class
 	 * @alias sap.ui.core.EnabledPropagator

package/src/sap/ui/core/EventBus.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @public
 	 * @since 1.8.0
 	 * @alias sap.ui.core.EventBus

package/src/sap/ui/core/Fragment.js

@@ -60,7 +60,7 @@ function(
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @public
 	 * @alias sap.ui.core.Fragment
 	 */

package/src/sap/ui/core/HTML.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.HTML

package/src/sap/ui/core/History.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/ui/util/Storage"],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @alias sap.ui.core.History
 	 * @protected
 	 */

package/src/sap/ui/core/Icon.js

@@ -65,12 +65,15 @@ sap.ui.define([
 	 * @class
 	 * Icon uses embedded font instead of pixel image. Comparing to image, Icon is easily scalable, color can be altered live and various effects can be added using css.
 	 *
-	 * A set of built in Icons is available and they can be fetched by calling sap.ui.core.IconPool.getIconURI and set this value to the src property on the Icon.
+	 * A set of built in Icons is available in the <a href="test-resources/sap/m/demokit/iconExplorer/webapp/index.html">Icon Explorer</a>.
+	 *
+	 * For further information, see {@link topic:21ea0ea94614480d9a910b2e93431291 Icon and Icon Pool}.
+	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @since 1.11.1
@@ -86,7 +89,18 @@ sap.ui.define([
 			properties : {
 
 				/**
-				 * This property should be set by the return value of calling sap.ui.core.IconPool.getIconURI with an Icon name parameter and an optional collection parameter which is required when using application extended Icons. A list of standard FontIcon is available here.
+				 * This property can be set by following options:
+				 *
+				 * <b>Option 1:</b></br>
+				 * The value has to be matched by following pattern <code>sap-icon://collection-name/icon-name</code> where
+				 * <code>collection-name</code> and <code>icon-name</code> have to be replaced by the desired values.
+				 * In case the default UI5 icons are used the <code>collection-name</code> can be omited.</br>
+				 * <i>Example:</i> <code>sap-icon://accept</code>
+				 *
+				 * <b>Option 2:</b>
+				 * The value is determined by using {@link sap.ui.core.IconPool.getIconURI} with an Icon name parameter
+				 * and an optional collection parameter which is required when using application extended Icons.</br>
+				 * <i>Example:</i> <code>IconPool.getIconURI("accept")</code>
 				 */
 				src : {type : "sap.ui.core.URI", group : "Data", defaultValue : null},
 

package/src/sap/ui/core/IndicationColorSupport.js

@@ -16,7 +16,7 @@ sap.ui.define(['./library'],
 		 * Helper functionality for indication color support.
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 * @public
 		 * @namespace sap.ui.core.IndicationColorSupport
 		 * @since 1.66

package/src/sap/ui/core/IntervalTrigger.js

@@ -23,7 +23,7 @@ sap.ui.define(['../base/Object', './EventBus', "sap/base/assert"],
 		 *
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 * @public
 		 * @since 1.11.0
 		 * @alias sap.ui.core.IntervalTrigger

package/src/sap/ui/core/InvisibleMessage.js

@@ -32,7 +32,7 @@ function (coreLibrary, ManagedObject, Log) {
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @hideconstructor
 	 * @public
 	 * @since 1.78

package/src/sap/ui/core/InvisibleRenderer.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 * Provides the default renderer for the controls that have set their <code>visible</code> property to <code>false</code>.
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @alias module:sap/ui/core/InvisibleRenderer
 	 * @since 1.66.0
 	 * @protected

package/src/sap/ui/core/InvisibleText.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @since 1.27.0

package/src/sap/ui/core/Item.js

@@ -24,7 +24,7 @@ sap.ui.define(['./Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.Item

package/src/sap/ui/core/LabelEnablement.js

@@ -136,7 +136,7 @@ sap.ui.define(['../base/ManagedObject', "sap/base/assert"],
 	 * @see sap.ui.core.LabelEnablement#enrich
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @protected
 	 * @alias sap.ui.core.LabelEnablement
 	 * @namespace

package/src/sap/ui/core/LayoutData.js

@@ -23,7 +23,7 @@ sap.ui.define(['./Element', "sap/ui/thirdparty/jquery", './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.LayoutData

package/src/sap/ui/core/ListItem.js

@@ -23,7 +23,7 @@ sap.ui.define(['./Item', './library'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.ListItem

package/src/sap/ui/core/LocalBusyIndicator.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @since 1.11.0

package/src/sap/ui/core/Locale.js

@@ -38,7 +38,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/base/assert', './CalendarType'],
 		 *
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 * @public
 		 * @alias sap.ui.core.Locale
 		 */

package/src/sap/ui/core/LocaleData.js

@@ -18,7 +18,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @public
 	 * @alias sap.ui.core.LocaleData
 	 */
@@ -27,7 +27,9 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 		constructor: function(oLocale) {
 			this.oLocale = oLocale;
 			BaseObject.apply(this);
-			this.mData = getData(oLocale);
+			var oDataLoaded = getData(oLocale);
+			this.mData = oDataLoaded.mData;
+			this.sCLDRLocaleId = oDataLoaded.sCLDRLocaleId;
 		},
 
 		/**
@@ -2082,7 +2084,13 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 			sLanguage = "sr_Latn";
 		}
 
-		var sId = sLanguage + "_" + sRegion; // the originally requested locale; this is the key under which the result (even a fallback one) will be stored in the end
+		// sId is the originally requested locale.
+		// this is the key under which the result (even a fallback one) will be stored in the end
+		var sId = sLanguage + "_" + sRegion;
+
+		// the locale of the loaded json file
+		var sCLDRLocaleId = sId;
+
 		// first try: load CLDR data for specific language / region combination
 		if ( sLanguage && sRegion ) {
 			mData = getOrLoad(sId);
@@ -2090,11 +2098,22 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 		// second try: load data for language only
 		if ( !mData && sLanguage ) {
 			mData = getOrLoad(sLanguage);
+			sCLDRLocaleId = sLanguage;
 		}
 		// last try: load data for default language "en" (english)
-		mLocaleDatas[sId] = mData || getOrLoad("en");
+		if (!mData) {
+			mData = getOrLoad("en");
+			sCLDRLocaleId = "en";
+		}
+
+		// store in cache
+		mLocaleDatas[sId] = mData;
 
-		return mLocaleDatas[sId];
+		sCLDRLocaleId = sCLDRLocaleId.replace(/_/g, "-");
+		return {
+			mData: mData,
+			sCLDRLocaleId: sCLDRLocaleId
+		};
 	}
 
 

package/src/sap/ui/core/Manifest.js

@@ -137,7 +137,7 @@ sap.ui.define([
 	 * @class The Manifest class.
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @alias sap.ui.core.Manifest
 	 * @since 1.33.0
 	 */

package/src/sap/ui/core/Message.js

@@ -26,7 +26,7 @@ sap.ui.define(['./Element', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.Message

package/src/sap/ui/core/Patcher.js

@@ -304,7 +304,7 @@ sap.ui.define([
 	 * This is only valid when called between <code>openStart/voidStart</code> and <code>openEnd/voidEnd</code>.
 	 * Case-insensitive attribute names must all be set in lowercase.
 	 *
-	 * @param {string} vAttr Name of the attribute
+	 * @param {string} sAttr Name of the attribute
 	 * @param {*} vValue Value of the attribute; any non-string value specified is converted automatically into a string
 	 * @return {this} Reference to <code>this</code> in order to allow method chaining
 	 */
@@ -361,8 +361,8 @@ sap.ui.define([
 	 *
 	 * This is only valid when called between <code>openStart/voidStart</code> and <code>openEnd/voidEnd</code>.
 	 *
-	 * @param {string} sStyle Name of the style property
-	 * @param {string} sValue Value of the style property
+	 * @param {string} sName Name of the style property
+	 * @param {string} vValue Value of the style property
 	 * @return {this} Reference to <code>this</code> in order to allow method chaining
 	 */
 	Patcher.prototype.style = function(sName, vValue) {

package/src/sap/ui/core/Popup.js

@@ -66,6 +66,9 @@ sap.ui.define([
 	// shortcut for sap.ui.core.OpenState
 	var OpenState = library.OpenState;
 
+	// shortcut for sap.ui.core.Collision
+	var Collision = library.Collision;
+
 	var oStaticUIArea;
 
 	var vGlobalWithinArea;
@@ -758,7 +761,7 @@ sap.ui.define([
 	/**
 	 * Opens the popup's content at the position either specified here or beforehand via {@link #setPosition}.
 	 * Content must be capable of being positioned via "position:absolute;"
-	 * All parameters are optional (open() may be called without any parameters). iDuration may just be omitted, but if any of "at", "of", "offset", "collision" is given, also the preceding positioning parameters ("my", at",...) must be given.
+	 * All parameters are optional (open() may be called without any parameters). iDuration may just be omitted, but if any of "at", "of", "offset", "collision" is given, also the preceding positional parameters ("my", at",...) must be given.
 	 *
 	 * If the Popup's OpenState is different from "CLOSED" (i.e. if the Popup is already open, opening or closing), the call is ignored.
 	 *
@@ -767,9 +770,9 @@ sap.ui.define([
 	 * @param {sap.ui.core.Popup.Dock} [at=sap.ui.core.Popup.Dock.CenterCenter] the "of" element's reference point for docking to
 	 * @param {string | sap.ui.core.Element | Element | jQuery | jQuery.Event} [of=document] specifies the reference element to which the given content should dock to
 	 * @param {string} [offset='0 0'] the offset relative to the docking point, specified as a string with space-separated pixel values (e.g. "10 0" to move the popup 10 pixels to the right). If the docking of both "my" and "at" are both RTL-sensitive ("begin" or "end"), this offset is automatically mirrored in the RTL case as well.
-	 * @param {string} [collision='flip'] defines how the position of an element should be adjusted in case it overflows the within area in some direction.
+	 * @param {sap.ui.core.Collision} [collision='flip'] defines how the position of an element should be adjusted in case it overflows the within area in some direction.
 	 * @param {string | sap.ui.core.Element | Element | Window} [within=Window] defines the area the popup should be placed in. This affects the collision detection.
-	 * @param {boolean} [followOf=false] defines whether the popup should follow the dock reference when the reference changes its position.
+	 * @param {boolean | function | null} [followOf=false] defines whether the popup should follow the dock reference when the reference changes its position.
 	 * @public
 	 */
 	Popup.prototype.open = function(iDuration, my, at, of, offset, collision, within, followOf) {
@@ -811,7 +814,7 @@ sap.ui.define([
 		assert(at === undefined || typeof at === "string", "at must be a string or empty");
 		assert(!of || typeof of === "object" || typeof of === "function", "of must be empty or an object");
 		assert(!offset || typeof offset === "string", "offset must be empty or a string");
-		assert(!collision || typeof collision === "string", "collision must be empty or a string");
+		assert(!collision || Collision.isValid(collision), "collision must be empty or of type sap.ui.core.Collision");
 		assert(!within || within === window || typeof within === "string" || within instanceof Element || within instanceof HTMLElement, "within must be either empty, or the global window object, or a string, or a sap.ui.core.Element, or a DOM element");
 		assert(!followOf || typeof followOf === "boolean" || typeof followOf === "function" || followOf === Popup.CLOSE_ON_SCROLL, "followOf must be either empty or a boolean");
 
@@ -1600,7 +1603,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.Popup.Dock | {left: sap.ui.core.CSSSize, top: sap.ui.core.CSSSize}} at specifies the point of the reference element to which the given Content should be aligned
 	 * @param {string | sap.ui.core.Element | Element | jQuery | jQuery.Event} [of=document] specifies the reference element to which the given content should be aligned as specified in the other parameters
 	 * @param {string} [offset='0 0'] the offset relative to the docking point, specified as a string with space-separated pixel values (e.g. "0 10" to move the popup 10 pixels to the right). If the docking of both "my" and "at" are both RTL-sensitive ("begin" or "end"), this offset is automatically mirrored in the RTL case as well.
-	 * @param {string} [collision] defines how the position of an element should be adjusted in case it overflows the within area in some direction. The valid values that refer to jQuery-UI's position parameters are "flip", "fit" and "none".
+	 * @param {sap.ui.core.Collision} [collision] defines how the position of an element should be adjusted in case it overflows the within area in some direction.
 	 * @param {string | sap.ui.core.Element | Element | Window} [within=Window] defines the area the popup should be placed in. This affects the collision detection.
 	 * @return {this} <code>this</code> to allow method chaining
 	 * @public
@@ -1610,7 +1613,7 @@ sap.ui.define([
 		assert(typeof at === "string" || (typeof at === "object" && (typeof at.left === "number") && (typeof at.top === "number")), "my must be a string or an object with 'left' and 'top' properties");
 		assert(!of || typeof of === "object" || typeof of === "function", "of must be empty or an object");
 		assert(!offset || typeof offset === "string", "offset must be empty or a string");
-		assert(!collision || typeof collision === "string", "collision must be empty or a string");
+		assert(!collision || Collision.isValid(collision), "collision must be empty or of type sap.ui.core.Collision");
 		assert(!within || within === window || typeof within === "string" || within instanceof Element || within instanceof HTMLElement, "within must be either empty, or the global window object, or a string, or a sap.ui.core.Element, or a DOM element");
 
 		this._oPosition = this._createPosition(my, at, of, offset, collision, within);