@openui5/sap.ui.core 1.96.11 → 1.96.13

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

@@ -76,7 +76,7 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 * @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
@@ -124,6 +124,7 @@ sap.ui.define([
 				this.sOperationMode = mParameters.$$operationMode || oModel.sOperationMode;
 				this.mPreviousContextsByPath = {};
 				this.aPreviousData = [];
+				this.sResumeAction = undefined; // a special resume action for $$sharedRequest
 				this.bSharedRequest = mParameters.$$sharedRequest || oModel.bSharedRequests;
 				this.aSorters = _Helper.toArray(vSorters);
 				this.sUpdateGroupId = mParameters.$$updateGroupId;
@@ -978,7 +979,7 @@ sap.ui.define([
 		}
 		this.aContexts.splice(iIndex, 1);
 		if (bDestroyLater && this.iCurrentEnd) {
-			// Add the context to mPreviousContextsByPath although it definitely won't be reused.
+			// Add the context to mPreviousContextsByPath, although it definitely won't be reused.
 			// Then it is destroyed later, but only if there is a listener (iCurrentEnd is set by
 			// getContexts and mPreviousContextsByPath is only cleared when getContexts is called)
 			this.mPreviousContextsByPath[oContext.getPath()] = oContext;
@@ -1023,9 +1024,16 @@ sap.ui.define([
 	 */
 	ODataListBinding.prototype.doCreateCache = function (sResourcePath, mQueryOptions, oContext,
 			sDeepResourcePath) {
-		return _AggregationCache.create(this.oModel.oRequestor, sResourcePath, sDeepResourcePath,
-			this.mParameters.$$aggregation, this.inheritQueryOptions(mQueryOptions, oContext),
-			this.oModel.bAutoExpandSelect, this.bSharedRequest);
+		var oCache = _AggregationCache.create(this.oModel.oRequestor, sResourcePath,
+				sDeepResourcePath, this.mParameters.$$aggregation,
+				this.inheritQueryOptions(mQueryOptions, oContext),
+				this.oModel.bAutoExpandSelect, this.bSharedRequest);
+
+		if (this.bSharedRequest) {
+			oCache.registerChange("", this);
+		}
+
+		return oCache;
 	};
 
 	/**
@@ -2314,6 +2322,35 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Notification from the cache that the collection has changed. Currently, only bindings with
+	 * bSharedRequest register at the cache and are notified when the cache has been reset.
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.onChange = function () {
+		var aDependentBindings,
+			that = this;
+
+		if (!this.oRefreshPromise) {
+			// some other binding with the same cache is refreshing
+			if (this.isRootBindingSuspended()) {
+				this.sResumeAction = "onChange";
+			} else {
+				// Note: after reset the dependent bindings cannot be found anymore
+				aDependentBindings = this.getDependentBindings();
+				this.reset(ChangeReason.Refresh);
+				SyncPromise.all(
+					aDependentBindings.map(function (oBinding) {
+						return oBinding.refreshInternal("");
+					})
+				).then(function () {
+					return that.oHeaderContext.checkUpdate();
+				}).catch(this.oModel.getReporter());
+			}
+		}
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataBinding#refreshInternal
@@ -2344,7 +2381,11 @@ sap.ui.define([
 		}
 
 		if (this.isRootBindingSuspended()) {
-			this.refreshSuspended(sGroupId);
+			if (this.bSharedRequest) {
+				this.sResumeAction = "resetCache";
+			} else {
+				this.refreshSuspended(sGroupId);
+			}
 			return SyncPromise.all(refreshAll(that.getDependentBindings()));
 		}
 
@@ -2357,29 +2398,34 @@ sap.ui.define([
 
 			if (oCache && !oPromise) { // do not refresh twice
 				that.removeCachesAndMessages(sResourcePathPrefix);
-				that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true);
-				oKeptElementsPromise = that.oCachePromise.then(function (oNewCache) {
-					return oNewCache.refreshKeptElements(that.lockGroup(sGroupId), onRemove);
-				});
-				if (that.iCurrentEnd > 0) {
-					oPromise = that.createRefreshPromise().catch(function (oError) {
-						if (!bKeepCacheOnError || oError.canceled) {
-							throw oError;
-						}
-						return that.fetchResourcePath(that.oContext).then(function (sResourcePath) {
-							if (!that.bRelative || oCache.getResourcePath() === sResourcePath) {
-								that.oCache = oCache;
-								that.oCachePromise = SyncPromise.resolve(oCache);
-								that.iCreatedContexts = iCreatedContexts;
-								oCache.setActive(true);
-								that._fireChange({reason : ChangeReason.Change});
+				if (that.bSharedRequest) {
+					oPromise = that.createRefreshPromise();
+					oCache.reset([]);
+				} else {
+					that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true);
+					oKeptElementsPromise = that.oCachePromise.then(function (oNewCache) {
+						return oNewCache.refreshKeptElements(that.lockGroup(sGroupId), onRemove);
+					});
+					if (that.iCurrentEnd > 0) {
+						oPromise = that.createRefreshPromise().catch(function (oError) {
+							if (!bKeepCacheOnError || oError.canceled) {
+								throw oError;
 							}
-							throw oError;
+							return that.fetchResourcePath(that.oContext).then(function (sResourcePath) {
+								if (!that.bRelative || oCache.getResourcePath() === sResourcePath) {
+									that.oCache = oCache;
+									that.oCachePromise = SyncPromise.resolve(oCache);
+									that.iCreatedContexts = iCreatedContexts;
+									oCache.setActive(true);
+									that._fireChange({reason : ChangeReason.Change});
+								}
+								throw oError;
+							});
 						});
-					});
+					}
 				}
 			}
-			// Note: after reset the dependent bindings cannot be found any more
+			// Note: after reset the dependent bindings cannot be found anymore
 			aDependentBindings = that.getDependentBindings();
 			that.reset(ChangeReason.Refresh); // this may reset that.oRefreshPromise
 			return SyncPromise.all(
@@ -2831,13 +2877,23 @@ sap.ui.define([
 	 */
 	ODataListBinding.prototype.resumeInternal = function (_bCheckUpdate, bParentHasChanges) {
 		var aBindings = this.getDependentBindings(),
+			sResumeAction = this.sResumeAction,
 			sResumeChangeReason = this.sResumeChangeReason,
-			bRefresh = bParentHasChanges || sResumeChangeReason;
+			bRefresh = bParentHasChanges || sResumeAction || sResumeChangeReason;
 
+		this.sResumeAction = undefined;
 		this.sResumeChangeReason = undefined;
 
 		if (bRefresh) {
 			this.removeCachesAndMessages("");
+			if (sResumeAction === "onChange") {
+				this.onChange();
+				return;
+			}
+			if (sResumeAction === "resetCache") {
+				this.oCache.reset([]);
+				return;
+			}
 			this.reset();
 			// if the parent binding resumes but there are no changes in the parent binding
 			// ignore the parent cache and create an own cache

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

@@ -658,7 +658,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 		/*

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

@@ -210,7 +210,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.Model
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */

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.11
+	 * @version 1.96.13
 	 * @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

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

@@ -434,7 +434,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Deregisters the given change listener. Note: shared caches have no listeners anyway.
+	 * Deregisters the given change listener. Note: shared caches only have listeners for the empty
+	 * path.
 	 *
 	 * @param {string} sPath
 	 *   The path
@@ -444,7 +445,7 @@ sap.ui.define([
 	 * @public
 	 */
 	_Cache.prototype.deregisterChange = function (sPath, oListener) {
-		if (!this.bSharedRequest) {
+		if (!(this.bSharedRequest && sPath)) {
 			_Helper.removeByPath(this.mChangeListeners, sPath, oListener);
 		}
 	};
@@ -1237,8 +1238,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Registers the listener for the path. Shared caches do not register listeners because they are
-	 * read-only.
+	 * Registers the listener for the path. Shared caches do not register listeners except for the
+	 * empty path, because they are read-only.
 	 *
 	 * @param {string} sPath The path
 	 * @param {object} [oListener] The listener
@@ -1246,7 +1247,7 @@ sap.ui.define([
 	 * @private
 	 */
 	_Cache.prototype.registerChange = function (sPath, oListener) {
-		if (!this.bSharedRequest) {
+		if (!(this.bSharedRequest && sPath)) {
 			_Helper.addByPath(this.mChangeListeners, sPath, oListener);
 		}
 	};
@@ -1476,8 +1477,8 @@ sap.ui.define([
 			this.iActiveUsages -= 1;
 			if (!this.iActiveUsages) {
 				this.iInactiveSince = Date.now();
+				this.mChangeListeners = {};
 			}
-			this.mChangeListeners = {}; // Note: shared caches have no listeners anyway
 		}
 	};
 
@@ -2693,6 +2694,21 @@ sap.ui.define([
 			});
 	};
 
+	/**
+	 * Resets this shared cache to its initial state and fires change events.
+	 *
+	 * @public
+	 */
+	_CollectionCache.prototype.reset = function () {
+		this.sContext = undefined;
+		this.aElements.length = this.aElements.$created = 0;
+		this.aElements.$byPredicate = {};
+		this.aElements.$count = undefined; // needed for setCount()
+		this.iLimit = Infinity;
+
+		_Helper.fireChange(this.mChangeListeners, "");
+	};
+
 	//*********************************************************************************************
 	// PropertyCache
 	//*********************************************************************************************

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

@@ -228,7 +228,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @param {object} oData either the URL where to load the XML from or an XML
 	 * @public

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.11
+	 * @version 1.96.13
 	 *
 	 * @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.11
+	 * @version 1.96.13
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/util/Storage.js

@@ -250,7 +250,7 @@ sap.ui.define(["sap/base/assert"], function (assert) {
 	 *
 	 * @enum {string}
 	 * @public
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	Storage.Type = {
 		/**