@openui5/sap.ui.core 1.96.2 → 1.97.0

package/src/sap/ui/model/odata/v4/ODataPropertyBinding.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
@@ -501,7 +501,7 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.ODataBinding#refreshInternal
 	 */
 	ODataPropertyBinding.prototype.refreshInternal = function (_sResourcePathPrefix, sGroupId,
-			bCheckUpdate, _bKeepCacheOnError) {
+			bCheckUpdate, bKeepCacheOnError) {
 		var that = this;
 
 		if (this.isRootBindingSuspended()) {
@@ -509,7 +509,7 @@ sap.ui.define([
 			return SyncPromise.resolve();
 		}
 		return this.oCachePromise.then(function () {
-			that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true);
+			that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true, bKeepCacheOnError);
 
 			if (bCheckUpdate) {
 				return that.checkUpdateInternal(undefined, ChangeReason.Refresh, sGroupId);

package/src/sap/ui/model/odata/v4/lib/_Cache.js

@@ -21,6 +21,7 @@ sap.ui.define([
 		//   EMPLOYEE($uid=id-1550828854217-16) -> aMatches[0] === "($uid=id-1550828854217-16)"
 		//   @see sap.base.util.uid
 		rEndsWithTransientPredicate = /\(\$uid=[-\w]+\)$/,
+		rInactive = /^\$inactive\./,
 		sMessagesAnnotation = "@com.sap.vocabularies.Common.v1.Messages",
 		rNumber = /^-?\d+$/,
 		// Matches two cases:  segment with predicate or simply predicate:
@@ -140,6 +141,10 @@ sap.ui.define([
 	 *   An entity with the ETag of the binding for which the deletion was requested. This is
 	 *   provided if the deletion is delegated from a context binding with empty path to a list
 	 *   binding.
+	 * @param {boolean} [bDoNotRequestCount]
+	 *   Whether not to request the new count from the server; useful in case of
+	 *   {@link sap.ui.model.odata.v4.Context#replaceWith} where it is known that the count remains
+	 *   unchanged
 	 * @param {function} fnCallback
 	 *   A function which is called after a transient entity has been deleted from the cache or
 	 *   after the entity has been deleted from the server and from the cache; the index of the
@@ -150,7 +155,8 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	_Cache.prototype._delete = function (oGroupLock, sEditUrl, sPath, oETagEntity, fnCallback) {
+	_Cache.prototype._delete = function (oGroupLock, sEditUrl, sPath, oETagEntity,
+			bDoNotRequestCount, fnCallback) {
 		var aSegments = sPath.split("/"),
 			vDeleteProperty = aSegments.pop(),
 			iIndex = rNumber.test(vDeleteProperty) ? Number(vDeleteProperty) : undefined,
@@ -214,6 +220,7 @@ sap.ui.define([
 							[], [sEntityPath]);
 					}),
 				iIndex === undefined // single element or kept-alive not in list
+					&& !bDoNotRequestCount
 					&& that.requestCount(oGroupLock),
 				oGroupLock.unlock() // unlock when all requests have been queued
 			]);
@@ -395,6 +402,7 @@ sap.ui.define([
 				if (that.fetchTypes().isRejected()) {
 					throw oError;
 				}
+				sPostGroupId = sPostGroupId.replace(rInactive, "");
 				return request(sPostPath, that.oRequestor.lockGroup(
 					that.oRequestor.getGroupSubmitMode(sPostGroupId) === "API" ?
 						sPostGroupId : "$parked." + sPostGroupId, that, true, true));
@@ -989,14 +997,23 @@ sap.ui.define([
 	 *
 	 * @param {string} sPath
 	 *   The relative path of a binding; must not end with '/'
+	 * @param {boolean} [bIgnoreKeptAlive]
+	 *   Whether to ignore changes which will not be lost by APIs like sort or filter because they
+	 *   relate to a context which is kept alive.
 	 * @returns {boolean}
 	 *   <code>true</code> if there are pending changes
 	 *
 	 * @public
 	 */
-	_Cache.prototype.hasPendingChangesForPath = function (sPath) {
+	_Cache.prototype.hasPendingChangesForPath = function (sPath, bIgnoreKeptAlive) {
+		var that = this;
+
 		return Object.keys(this.mPatchRequests).some(function (sRequestPath) {
-			return isSubPath(sRequestPath, sPath);
+			return isSubPath(sRequestPath, sPath)
+				&& !(bIgnoreKeptAlive
+					&& that.mPatchRequests[sRequestPath].every(function (oPatchPromise) {
+						return oPatchPromise.$isKeepAlive();
+					}));
 		}) || Object.keys(this.mPostRequests).some(function (sRequestPath) {
 			return isSubPath(sRequestPath, sPath);
 		});
@@ -1620,6 +1637,8 @@ sap.ui.define([
 	 * @param {function} fnPatchSent
 	 *   The function is called just before a back-end request is sent for the first time.
 	 *   If no back-end request is needed, the function is not called.
+	 * @param {function} fnIsKeepAlive
+	 *   A function to tell whether the entity is kept-alive
 	 * @returns {Promise}
 	 *   A promise for the PATCH request (resolves with <code>undefined</code>); rejected in case of
 	 *   cancellation or if no <code>fnErrorCallback</code> is given
@@ -1628,7 +1647,8 @@ sap.ui.define([
 	 * @public
 	 */
 	_Cache.prototype.update = function (oGroupLock, sPropertyPath, vValue, fnErrorCallback,
-			sEditUrl, sEntityPath, sUnitOrCurrencyPath, bPatchWithoutSideEffects, fnPatchSent) {
+			sEditUrl, sEntityPath, sUnitOrCurrencyPath, bPatchWithoutSideEffects, fnPatchSent,
+			fnIsKeepAlive) {
 		var oPromise,
 			aPropertyPath = sPropertyPath.split("/"),
 			aUnitOrCurrencyPath,
@@ -1691,6 +1711,7 @@ sap.ui.define([
 					mHeaders, oUpdateData, onSubmit, onCancel, /*sMetaPath*/undefined,
 					_Helper.buildPath(that.getOriginalResourcePath(oEntity), sEntityPath),
 					bAtFront);
+				oPatchPromise.$isKeepAlive = fnIsKeepAlive;
 				_Helper.addByPath(that.mPatchRequests, sFullPath, oPatchPromise);
 				return SyncPromise.all([
 					oPatchPromise,
@@ -1761,9 +1782,10 @@ sap.ui.define([
 				if (sTransientGroup === true) {
 					throw new Error("No 'update' allowed while waiting for server response");
 				}
-				if (sTransientGroup.startsWith("$parked.")) {
+				if (sTransientGroup.startsWith("$parked.")
+						|| sTransientGroup.startsWith("$inactive.")) {
 					sParkedGroup = sTransientGroup;
-					sTransientGroup = sTransientGroup.slice(8);
+					sTransientGroup = sTransientGroup.slice(sTransientGroup.indexOf(".") + 1);
 				}
 				if (sTransientGroup !== sGroupId) {
 					throw new Error("The entity will be created via group '" + sTransientGroup
@@ -2073,6 +2095,19 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Replaces the old element at the given index with the given new element.
+	 *
+	 * @param {number} iIndex - The index
+	 * @param {object} oElement - The new element
+	 *
+	 * @public
+	 */
+	_CollectionCache.prototype.doReplaceWith = function (iIndex, oElement) {
+		this.aElements[iIndex] = oElement;
+		this.addKeptElement(oElement); // maintain $byPredicate
+	};
+
 	/**
 	 * Returns a promise to be resolved (synchronously if possible) with an OData object for the
 	 * requested data.
@@ -2303,7 +2338,8 @@ sap.ui.define([
 				oKeptElement = this.aElements.$byPredicate[sPredicate];
 				if (oKeptElement) {
 					if (oElement["@odata.etag"] === oKeptElement["@odata.etag"]) {
-						_Helper.merge(oElement, oKeptElement);
+						_Helper.updateNonExisting(oKeptElement, oElement);
+						oElement = oKeptElement;
 					} else if (this.hasPendingChangesForPath(sPredicate)) {
 						throw new Error("Modified on client and on server: "
 							+ this.sResourcePath + sPredicate);
@@ -2456,7 +2492,9 @@ sap.ui.define([
 			var aKeyFilters,
 				mQueryOptions = _Helper.merge({}, that.mQueryOptions);
 
-			_Helper.aggregateExpandSelect(mQueryOptions, that.mLateQueryOptions);
+			if (that.mLateQueryOptions) {
+				_Helper.aggregateExpandSelect(mQueryOptions, that.mLateQueryOptions);
+			}
 			delete mQueryOptions.$count;
 			delete mQueryOptions.$orderby;
 			delete mQueryOptions.$search;
@@ -2588,6 +2626,7 @@ sap.ui.define([
 			mQueryOptions,
 			mPredicates = {}, // a set of the predicates (as map to true) to speed up the search
 			sResourcePath,
+			bSkip,
 			mTypeForMetaPath = this.fetchTypes().getResult(),
 			that = this;
 
@@ -2662,8 +2701,15 @@ sap.ui.define([
 			+ this.oRequestor.buildQueryString(this.sMetaPath, mQueryOptions, false, true);
 
 		return this.oRequestor.request("GET", sResourcePath, oGroupLock, undefined, undefined,
-				undefined, undefined, this.sMetaPath, undefined, false, mMergeableQueryOptions
-			).then(function (oResult) {
+				undefined, undefined, this.sMetaPath, undefined, false, mMergeableQueryOptions,
+				function (aOtherPaths) {
+					if (arguments.length) {
+						aPaths = aPaths.concat(aOtherPaths);
+					} else {
+						bSkip = true; // my GET was merged
+						return aPaths;
+					}
+			}).then(function (oResult) {
 				var oElement, sPredicate, i, n;
 
 				function preventKeyPredicateChange(sPath) {
@@ -2674,6 +2720,10 @@ sap.ui.define([
 					});
 				}
 
+				if (bSkip) {
+					return;
+				}
+
 				if (oResult.value.length !== aElements.length) {
 					throw new Error("Expected " + aElements.length + " row(s), but instead saw "
 						+ oResult.value.length);
@@ -2691,6 +2741,38 @@ sap.ui.define([
 			});
 	};
 
+	/**
+	 * Resets this cache to its initial state, but keeps certain elements and their change listeners
+	 * alive.
+	 *
+	 * @param {string[]} aKeptElementPredicates
+	 *   The key predicates for all kept-alive elements
+	 *
+	 * @public
+	 */
+	_CollectionCache.prototype.reset = function (aKeptElementPredicates) {
+		var mChangeListeners = this.mChangeListeners,
+			mByPredicate = this.aElements.$byPredicate,
+			that = this;
+
+		this.mChangeListeners = {};
+		this.sContext = undefined;
+		this.aElements = [];
+		this.aElements.$byPredicate = {};
+		this.aElements.$count = undefined; // needed for setCount()
+		this.aElements.$created = 0;
+		this.iLimit = Infinity;
+
+		Object.keys(mChangeListeners).forEach(function (sPath) {
+			if (aKeptElementPredicates.includes(sPath.split("/")[0])) {
+				that.mChangeListeners[sPath] = mChangeListeners[sPath];
+			}
+		});
+		aKeptElementPredicates.forEach(function (sPredicate) {
+			that.aElements.$byPredicate[sPredicate] = mByPredicate[sPredicate];
+		});
+	};
+
 	//*********************************************************************************************
 	// PropertyCache
 	//*********************************************************************************************
@@ -3055,6 +3137,7 @@ sap.ui.define([
 			oOldValuePromise = this.oPromise,
 			mQueryOptions,
 			oResult,
+			bSkip,
 			that = this;
 
 		this.checkSharedRequest();
@@ -3072,7 +3155,15 @@ sap.ui.define([
 			+ this.oRequestor.buildQueryString(this.sMetaPath, mQueryOptions, false, true);
 		oResult = SyncPromise.all([
 			this.oRequestor.request("GET", sResourcePath, oGroupLock, undefined, undefined,
-				undefined, undefined, this.sMetaPath, undefined, false, mMergeableQueryOptions),
+				undefined, undefined, this.sMetaPath, undefined, false, mMergeableQueryOptions,
+				function (aOtherPaths) {
+					if (arguments.length) {
+						aPaths = aPaths.concat(aOtherPaths);
+					} else {
+						bSkip = true; // my GET was merged
+						return aPaths;
+					}
+				}),
 			this.fetchTypes(),
 			this.fetchValue(_GroupLock.$cached, "") // Note: includes some additional checks
 		]).then(function (aResult) {
@@ -3083,6 +3174,10 @@ sap.ui.define([
 			var oNewValue = aResult[0],
 				oOldValue = aResult[2];
 
+			if (bSkip) {
+				return;
+			}
+
 			// ensure that the new value has a predicate although key properties were not requested
 			_Helper.setPrivateAnnotation(oNewValue, "predicate",
 				_Helper.getPrivateAnnotation(oOldValue, "predicate"));

package/src/sap/ui/model/odata/v4/lib/_Helper.js

@@ -1874,7 +1874,7 @@ sap.ui.define([
 		 * properties therein.
 		 *
 		 * Restrictions:
-		 * - oTarget and oSource are expected to have the same structure; when there is an
+		 * - oTarget and oSource are expected to have the same structure: when there is an
 		 *   object at a given path in either of them, the other one must have an object or
 		 *   <code>null</code>.
 		 * - no change events for collection-valued properties; list bindings without own cache must
@@ -1937,7 +1937,7 @@ sap.ui.define([
 		 * advertised actions.
 		 *
 		 * Restrictions:
-		 * - oOldObject and oNewObject are expected to have the same structure; when there is an
+		 * - oOldObject and oNewObject are expected to have the same structure: when there is an
 		 *   object at a given path in either of them, the other one must have an object or
 		 *   <code>null</code>.
 		 * - no change events for collection-valued properties
@@ -2004,6 +2004,36 @@ sap.ui.define([
 			});
 		},
 
+		/**
+		 * Recursively adds all properties of oSource to oTarget that do not exist there yet.
+		 * Ensures that object references in oTarget remain unchanged.
+		 *
+		 * Restrictions:
+		 * - oTarget and oSource are expected to have the same structure: when there is an
+		 *   object at a given path in either of them, the other one must have an object.
+		 *   <code>null</code>, or no property at all.
+		 * - arrays are not merged in any way, they are taken either from oSource or from oTarget
+		 *
+		 * @param {object} oTarget - The target
+		 * @param {object} oSource - The source
+		 */
+		updateNonExisting : function (oTarget, oSource) {
+			Object.keys(oSource).forEach(function (sKey) {
+				var vSourceValue = oSource[sKey],
+					vTargetValue;
+
+				if (sKey in oTarget) {
+					vTargetValue = oTarget[sKey];
+					if (vSourceValue && vTargetValue
+							&& typeof vSourceValue === "object" && !Array.isArray(vSourceValue)) {
+						_Helper.updateNonExisting(vTargetValue, vSourceValue);
+					}
+				} else {
+					oTarget[sKey] = vSourceValue;
+				}
+			});
+		},
+
 		/**
 		 * Updates the old value with the given new value for the selected properties (see
 		 * {@link #updateExisting}). If no selected properties are given or if "*" is contained in
@@ -2011,7 +2041,7 @@ sap.ui.define([
 		 * changed properties.
 		 *
 		 * Restrictions:
-		 * - oOldValue and oNewValue are expected to have the same structure; when there is an
+		 * - oOldValue and oNewValue are expected to have the same structure: when there is an
 		 *   object at a given path in either of them, the other one must have an object or
 		 *   <code>null</code>.
 		 * - "*" in aSelect does not work correctly if oNewValue contains navigation properties

package/src/sap/ui/model/odata/v4/lib/_Requestor.js

@@ -1062,7 +1062,7 @@ sap.ui.define([
 	 * Merges all GET requests that are marked as mergeable, have the same resource path and the
 	 * same query options besides $expand and $select. One request with the merged $expand and
 	 * $select is left in the queue and all merged requests get the response of this one remaining
-	 * request.
+	 * request. For $mergeRequests, see parameter fnMergeRequests of {@link #request}.
 	 *
 	 * @param {object[]} aRequests The batch queue
 	 * @returns {object[]} The adjusted batch queue
@@ -1076,6 +1076,9 @@ sap.ui.define([
 				if (oCandidate.$queryOptions && oRequest.url === oCandidate.url) {
 					_Helper.aggregateExpandSelect(oCandidate.$queryOptions, oRequest.$queryOptions);
 					oRequest.$resolve(oCandidate.$promise);
+					if (oCandidate.$mergeRequests && oRequest.$mergeRequests) {
+						oCandidate.$mergeRequests(oRequest.$mergeRequests());
+					}
 
 					return true;
 				}
@@ -1545,6 +1548,10 @@ sap.ui.define([
 	 *   Query options if it is allowed to merge this request with another request having the same
 	 *   sResourcePath (only allowed for GET requests); the resulting resource path is the path from
 	 *   sResourcePath plus the merged query options; may only contain $expand and $select
+	 * @param {function(string[]):string[]} [fnMergeRequests]
+	 *    Function which is called during merging of GET requests. If a merged request has a
+	 *    function given, this function will be called and its return value is
+	 *    given to the one remaining request's function as a parameter.
 	 * @returns {Promise}
 	 *   A promise on the outcome of the HTTP request; it will be rejected with an error having the
 	 *   property <code>canceled = true</code> instead of sending a request if
@@ -1555,7 +1562,8 @@ sap.ui.define([
 	 * @public
 	 */
 	_Requestor.prototype.request = function (sMethod, sResourcePath, oGroupLock, mHeaders, oPayload,
-			fnSubmit, fnCancel, sMetaPath, sOriginalResourcePath, bAtFront, mQueryOptions) {
+			fnSubmit, fnCancel, sMetaPath, sOriginalResourcePath, bAtFront, mQueryOptions,
+			fnMergeRequests) {
 		var iChangeSetNo,
 			oError,
 			sGroupId = oGroupLock && oGroupLock.getGroupId() || "$direct",
@@ -1599,6 +1607,7 @@ sap.ui.define([
 						that.mFinalHeaders),
 					body : oPayload,
 					$cancel : fnCancel,
+					$mergeRequests : fnMergeRequests,
 					$metaPath : sMetaPath,
 					$queryOptions : mQueryOptions,
 					$reject : fnReject,

package/src/sap/ui/model/resource/ResourceModel.js

@@ -228,7 +228,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

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

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

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

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @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

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] formatting options. Supports the same options as {@link sap.ui.core.format.FileSizeFormat.getInstance FileSizeFormat.getInstance}

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.NumberFormat NumberFormat}.

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.NumberFormat NumberFormat}.

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

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

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @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

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @param {object} oData either the URL where to load the XML from or an XML
 	 * @public
@@ -181,7 +181,7 @@ sap.ui.define([
 		this.oNameSpaces[sPrefix] = sNameSpace;
 	};
 
-	/**
+	/*
 	 * @see sap.ui.model.Model.prototype.bindProperty
 	 */
 	XMLModel.prototype.bindProperty = function(sPath, oContext, mParameters) {
@@ -189,7 +189,7 @@ sap.ui.define([
 		return oBinding;
 	};
 
-	/**
+	/*
 	 * @see sap.ui.model.Model.prototype.bindList
 	 */
 	XMLModel.prototype.bindList = function(sPath, oContext, aSorters, aFilters, mParameters) {
@@ -197,7 +197,7 @@ sap.ui.define([
 		return oBinding;
 	};
 
-	/**
+	/*
 	 * @see sap.ui.model.Model.prototype.bindTree
 	 */
 	XMLModel.prototype.bindTree = function(sPath, oContext, aFilters, mParameters, aSorters) {
@@ -267,7 +267,7 @@ sap.ui.define([
 	XMLModel.prototype.getProperty = function(sPath, oContext) {
 		var oResult = this._getObject(sPath, oContext);
 		if (oResult && typeof oResult != "string") {
-			oResult = oResult[0] ? oResult[0].textContent : ""; // TODO is this right? shouldn't we return the object?!
+			oResult = oResult[0] ? oResult[0].textContent : "";
 		}
 		return oResult;
 	};

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 */
 	var XMLPropertyBinding = ClientPropertyBinding.extend("sap.ui.model.xml.XMLPropertyBinding");
 
-	/**
+	/*
 	 * @see sap.ui.model.PropertyBinding.prototype.setValue
 	 */
 	XMLPropertyBinding.prototype.setValue = function(oValue){

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -27,7 +27,7 @@ sap.ui.define([ 'sap/ui/core/Element', 'sap/ui/core/Control', 'sap/ui/core/Core'
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/actions/Action.js

@@ -207,9 +207,12 @@ function (ManagedObject, QUnitUtils, Opa5, Device, jQueryDOM, _OpaLogger) {
 		 *
 		 * @param {string} sName Name of the mouse event
 		 * @param {Element} oDomRef DOM element on which the event is going to be triggered
+		 * @param {boolean} bShiftKey Indicates whether the shift key is down in addition
+	 	 * @param {boolean} bAltKey Indicates whether the alt key is down in addition
+	 	 * @param {boolean} bCtrlKey Indicates whether the ctrl key is down in addition
 		 * @private
 		 */
-		_createAndDispatchMouseEvent: function (sName, oDomRef) {
+		_createAndDispatchMouseEvent: function (sName, oDomRef, bShiftKey, bAltKey, bCtrlKey) {
 			// ignore scrolled down stuff (client X, Y not set)
 			// and assume stuff is over the whole screen (screen X, Y not set)
 			// See file jquery.sap.events.js for some insights to the magic
@@ -224,8 +227,12 @@ function (ManagedObject, QUnitUtils, Opa5, Device, jQueryDOM, _OpaLogger) {
 				radiusY: 1,
 				rotationAngle: 0,
 				button: iLeftMouseButtonIndex,
-				type: sName // include the type so jQuery.event.fixHooks can copy properties properly
+				type: sName, // include the type so jQuery.event.fixHooks can copy properties properly
+				shiftKey: bShiftKey,
+				altKey: bAltKey,
+				ctrlKey: bCtrlKey
 			});
+
 			oDomRef.dispatchEvent(oMouseEvent);
 		},