@openui5/sap.ui.core 1.96.11 → 1.96.13

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

@@ -9,6 +9,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/extend",
 	"sap/base/util/isEmptyObject",
+	"sap/base/util/UriParameters",
 	"sap/ui/base/BindingParser",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/base/SyncPromise",
@@ -22,9 +23,9 @@ sap.ui.define([
 	"sap/ui/model/json/JSONPropertyBinding",
 	"sap/ui/model/json/JSONTreeBinding",
 	"sap/ui/performance/Measurement"
-], function (Utils, Log, extend, isEmptyObject, BindingParser, ManagedObject, SyncPromise,
-		BindingMode, ClientContextBinding, Context, FilterProcessor, MetaModel, JSONListBinding,
-		JSONModel, JSONPropertyBinding, JSONTreeBinding, Measurement) {
+], function (Utils, Log, extend, isEmptyObject, UriParameters, BindingParser, ManagedObject,
+		SyncPromise, BindingMode, ClientContextBinding, Context, FilterProcessor, MetaModel,
+		JSONListBinding, JSONModel, JSONPropertyBinding, JSONTreeBinding, Measurement) {
 	"use strict";
 	/*global Map */
 
@@ -208,7 +209,7 @@ sap.ui.define([
 	 * {@link #loaded loaded} has been resolved!
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 * @alias sap.ui.model.odata.ODataMetaModel
 	 * @extends sap.ui.model.MetaModel
 	 * @public
@@ -557,8 +558,8 @@ sap.ui.define([
 		var that = this;
 
 		return this.oLoadedPromiseSync.then(function () {
-			var sCacheKey, oCodeListModel, oCodeListModelCache, sCollectionPath, oMappingPromise,
-				sMetaDataUrl, oPromise, oReadPromise,
+			var sCacheKey, sCacheKeyWithModel, oCodeListModel, oCodeListModelCache, sCollectionPath,
+				oMappingPromise, sMetaDataUrl, oPromise, oReadPromise,
 				sCodeListAnnotation = "com.sap.vocabularies.CodeList.v1." + sTerm,
 				oCodeListAnnotation = that.getODataEntityContainer()[sCodeListAnnotation];
 
@@ -579,19 +580,37 @@ sap.ui.define([
 			sCollectionPath = oCodeListAnnotation.CollectionPath.String;
 			sMetaDataUrl = that.oDataModel.getMetadataUrl();
 			sCacheKey = sMetaDataUrl + "#" + sCollectionPath;
+			// check for global cache entry
 			oPromise = mCodeListUrl2Promise.get(sCacheKey);
 			if (oPromise) {
 				return oPromise;
 			}
+			// check for an ODataModel related cache entry
+			sCacheKeyWithModel = sCacheKey + "#" + that.getId();
+			oPromise = mCodeListUrl2Promise.get(sCacheKeyWithModel);
+			if (oPromise) {
+				return oPromise;
+			}
 
 			oCodeListModelCache = that._getOrCreateSharedModelCache();
 			oCodeListModel = oCodeListModelCache.oModel;
 
 			oReadPromise = new SyncPromise(function (fnResolve, fnReject) {
+				var oUriParams = UriParameters.fromURL(sMetaDataUrl),
+					sClient = oUriParams.get("sap-client"),
+					sLanguage = oUriParams.get("sap-language"),
+					mUrlParameters = {$skip : 0, $top : 5000}; // avoid server-driven paging
+
+				if (sClient) {
+					mUrlParameters["sap-client"] = sClient;
+				}
+				if (sLanguage) {
+					mUrlParameters["sap-language"] = sLanguage;
+				}
 				oCodeListModel.read("/" + sCollectionPath, {
 					error : fnReject,
 					success : fnResolve,
-					urlParameters : {$skip : 0, $top : 5000} // avoid server-driven paging
+					urlParameters : mUrlParameters
 				});
 			});
 			oMappingPromise = new SyncPromise(function (fnResolve, fnReject) {
@@ -608,6 +627,9 @@ sap.ui.define([
 				var aData = aResults[0].results,
 					mMapping = aResults[1];
 
+				mCodeListUrl2Promise.set(sCacheKey, oPromise);
+				mCodeListUrl2Promise.delete(sCacheKeyWithModel); // not needed any more
+
 				return aData.reduce(function (mCode2Customizing, oEntity) {
 					var sCode = oEntity[mMapping.code],
 						oCustomizing = {
@@ -634,6 +656,7 @@ sap.ui.define([
 				if (oCodeListModel.bDestroyed) {
 					// do not cache rejected Promise caused by a destroyed code list model
 					mCodeListUrl2Promise.delete(sCacheKey);
+					mCodeListUrl2Promise.delete(sCacheKeyWithModel);
 				} else {
 					Log.error("Couldn't load code list: " + sCollectionPath + " for "
 							+ that.oDataModel.getCodeListModelParameters().serviceUrl,
@@ -650,7 +673,7 @@ sap.ui.define([
 					oCodeListModelCache.bFirstCodeListRequested = true;
 				}
 			});
-			mCodeListUrl2Promise.set(sCacheKey, oPromise);
+			mCodeListUrl2Promise.set(sCacheKeyWithModel, oPromise);
 
 			return oPromise;
 		});

package/src/sap/ui/model/odata/ODataMetadata.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * Implementation to access OData metadata
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.ODataMetadata

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

@@ -76,7 +76,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @public
 	 * @deprecated As of version 1.48, please use {@link sap.ui.model.odata.v2.ODataModel} instead.

package/src/sap/ui/model/odata/ODataTreeBindingFlat.js

@@ -4186,21 +4186,12 @@ sap.ui.define([
 	 *  2. none of its ancestor it's collapsed.
 	 */
 	ODataTreeBindingFlat.prototype._calcIndexDelta = function (iEndServerIndex) {
-		// collect all collapsed server indices and magnitude as a look-up table
-		// serverIndex + magnitude form a range for which we can check if there is a containment situation
-		var mCollapsedServerIndices = {};
-		this._aCollapsed.forEach(function (oNode) {
-			// only regard nodes with a server-index and not initially collapsed
-			if (oNode.serverIndex >= 0 && oNode.serverIndex < iEndServerIndex && !oNode.isDeepOne && !oNode.initiallyCollapsed) {
-				mCollapsedServerIndices[oNode.serverIndex] = oNode.magnitude;
-			}
-		});
+		var i, bIgnore, aManuallyCollapsedServerIndexNodes,
+			iCollapsedDelta = 0,
+			iExpandedDelta = 0,
+			iLastCollapsedIndex = 0;
 
-		// collapsed delta
-		var iLastCollapsedIndex = 0;
-		var iCollapsedDelta = 0;
-
-		for (var i = 0; i < this._aCollapsed.length; i++) {
+		for (i = 0; i < this._aCollapsed.length; i++) {
 			var oCollapsedNode = this._aCollapsed[i];
 
 			if (this._getRelatedServerIndex(oCollapsedNode) >= iEndServerIndex) {
@@ -4220,26 +4211,26 @@ sap.ui.define([
 			}
 		}
 
-		// expanded delta
-		var iExpandedDelta = 0;
-
-		var fnInCollapsedRange = function (oNode) {
-			var bIgnore = false;
-			var iContainingIndexToCheck = oNode.serverIndex || oNode.containingServerIndex;
-			for (var j in mCollapsedServerIndices) {
-				// if the expanded node is inside a collapsed range -> ignore it
-				if (iContainingIndexToCheck > j && iContainingIndexToCheck < j + mCollapsedServerIndices[j]) {
-					bIgnore = true;
-					break;
-				}
-			}
-			return bIgnore;
+		// filter all collapsed nodes for server-index nodes that are not initially collapsed
+		aManuallyCollapsedServerIndexNodes = this._aCollapsed.filter(function (oNode) {
+			return oNode.serverIndex >= 0 && oNode.serverIndex < iEndServerIndex
+				&& !oNode.isDeepOne && !oNode.initiallyCollapsed;
+		});
+
+		// Checks if the given expanded node is a child node of any of the manually collapsed
+		// server-index nodes
+		var fnInCollapsedRange = function (iExpandedNodeIndex) {
+			return aManuallyCollapsedServerIndexNodes.some(function (oNode) {
+				return iExpandedNodeIndex > oNode.serverIndex
+					&& iExpandedNodeIndex < oNode.serverIndex + oNode.magnitude;
+			});
 		};
 
 		for (i = 0; i < this._aExpanded.length; i++) {
-			var oExpandedNode = this._aExpanded[i];
+			var oExpandedNode = this._aExpanded[i],
+				iExpandedNodeIndex = this._getRelatedServerIndex(oExpandedNode);
 
-			if (this._getRelatedServerIndex(oExpandedNode) >= iEndServerIndex) {
+			if (iExpandedNodeIndex >= iEndServerIndex) {
 				break;
 			}
 
@@ -4256,7 +4247,9 @@ sap.ui.define([
 					oParent = oParent.parent;
 				}
 
-				var bIgnore = fnInCollapsedRange(oExpandedNode);
+				// if oExpandedNode is a child of a collapsed node it is not visible on the UI and
+				// can be ignored for the expanded delta
+				bIgnore = fnInCollapsedRange(iExpandedNodeIndex);
 
 				// if not then regard the children for the expanded delta
 				if (!bYep && !bIgnore) {
@@ -4265,7 +4258,7 @@ sap.ui.define([
 
 			} else if (oExpandedNode.initiallyCollapsed) {
 				// see if the node on the last auto-expand level is contained in a sub-tree of a collapsed server-indexed node
-				var bIgnore = fnInCollapsedRange(oExpandedNode);
+				bIgnore = fnInCollapsedRange(iExpandedNodeIndex);
 				if (!bIgnore) {
 					// still we have to check for a
 					iExpandedDelta += oExpandedNode.children.length;

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

@@ -87,7 +87,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Boolean
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Byte.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Byte
 	 * @param {object} [oFormatOptions]

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

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Currency
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var Currency = BaseCurrency.extend("sap.ui.model.odata.type.Currency", {
 		constructor : function (oFormatOptions, oConstraints) {

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

@@ -106,7 +106,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Date
 	 * @param {object} [oFormatOptions]

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

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.DateTime
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTimeBase.js

@@ -132,7 +132,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.27.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var DateTimeBase = ODataType.extend("sap.ui.model.odata.type.DateTimeBase", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/DateTimeOffset.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.DateTimeOffset
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Decimal.js

@@ -197,7 +197,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Decimal
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Double.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Double
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Guid.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Guid
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int.js

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.Int

package/src/sap/ui/model/odata/type/Int16.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Int16
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int32.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Int32
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int64.js

@@ -137,7 +137,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Int64
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/ODataType.js

@@ -115,7 +115,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.ODataType

package/src/sap/ui/model/odata/type/Raw.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var Raw = ODataType.extend("sap.ui.model.odata.type.Raw", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/SByte.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.SByte
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Single.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Single
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Stream.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.51.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var Stream = ODataType.extend("sap.ui.model.odata.type.Stream", {
 			constructor : function (oFormatOptions, oConstraints) {

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

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.String
 	 * @param {object} [oFormatOptions]

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

@@ -154,7 +154,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @alias sap.ui.model.odata.type.Time
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/TimeOfDay.js

@@ -110,7 +110,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var TimeOfDay = ODataType.extend("sap.ui.model.odata.type.TimeOfDay", {
 			constructor : function (oFormatOptions, oConstraints) {

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

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Unit
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var Unit = BaseUnit.extend("sap.ui.model.odata.type.Unit", {
 		constructor : function (oFormatOptions, oConstraints, aDynamicFormatOptionNames) {

package/src/sap/ui/model/odata/v2/Context.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise) {

package/src/sap/ui/model/odata/v2/ODataAnnotations.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @class Annotation loader for OData V2 services
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @public
 	 * @since 1.37.0

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

@@ -201,7 +201,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel

package/src/sap/ui/model/odata/v2/ODataTreeBinding.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 

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

@@ -98,7 +98,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.39.0
-	 * @version 1.96.11
+	 * @version 1.96.13
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 			constructor : function (oModel, oBinding, sPath, iIndex, oCreatePromise, iGeneration) {

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

@@ -310,9 +310,12 @@ sap.ui.define([
 	 * @since 1.66
 	 */
 	ODataBinding.prototype.destroy = function () {
+		var that = this;
+
 		this.mCacheByResourcePath = undefined;
 		this.oCachePromise.then(function (oOldCache) {
 			if (oOldCache) {
+				oOldCache.deregisterChange("", that);
 				oOldCache.setActive(false);
 			}
 		}, function () {});
@@ -405,6 +408,7 @@ sap.ui.define([
 
 		if (oCache) {
 			// if oCachePromise is pending no cache will be created because of oFetchCacheCallToken
+			oCache.deregisterChange("", this);
 			oCache.setActive(false);
 		} else if (bKeepQueryOptions) {
 			if (oCache === undefined) {

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

@@ -106,7 +106,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