@openui5/sap.ui.core 1.101.0 → 1.102.0

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

@@ -207,7 +207,7 @@ sap.ui.define([
 	 * {@link #loaded loaded} has been resolved!
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @alias sap.ui.model.odata.ODataMetaModel
 	 * @extends sap.ui.model.MetaModel
 	 * @public

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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @public
 	 * @deprecated As of version 1.48, please use {@link sap.ui.model.odata.v2.ODataModel} instead.

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

@@ -75,6 +75,12 @@ sap.ui.define(function() {
 		 * <li>Count mode <code>None</code> is not supported together with operation mode <code>Auto</code></li>
 		 * </ol>
 		 *
+		 * @deprecated As of 1.102.0, because filtering and sorting may lead to different results
+		 *   when executed on the client and on the server, and thus to inconsistent behavior. If it
+		 *   is certain that the collection is completely loaded on the client, use
+		 *   {@link sap.ui.model.odata.OperationMode.Client}; otherwise, use
+		 *   {@link sap.ui.model.odata.OperationMode.Default} or
+		 *   {@link sap.ui.model.odata.OperationMode.Server}.
 		 * @public
 		 */
 		Auto: "Auto"

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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 */
 	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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 */
 	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.101.0
+	 * @version 1.102.0
 	 *
 	 * @alias sap.ui.model.odata.type.DateTimeOffset
 	 * @param {object} [oFormatOptions]

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

@@ -60,8 +60,7 @@ sap.ui.define([
 	 * @public
 	 * @see {sap.ui.model.odata.v2.ODataModel#bindProperty}
 	 * @since 1.99.0
-	 * @experimental The behavior of this type may change in the future.
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 */
 	var DateTimeWithTimezone = CompositeType.extend("sap.ui.model.odata.type.DateTimeWithTimezone",
 		{

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

@@ -201,7 +201,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 */
 	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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 */
 	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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 *
 	 * @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.101.0
+	 * @version 1.102.0
 	 */
 	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.101.0
+	 * @version 1.102.0
 	 */
 	var Unit = BaseUnit.extend("sap.ui.model.odata.type.Unit", {
 		constructor : function (oFormatOptions, oConstraints, aDynamicFormatOptionNames) {

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

@@ -262,7 +262,7 @@ sap.ui.define([
 			}
 
 			aMatches = rDecimals.exec(vNumber);
-			iFractionDigits = aMatches ? aMatches[1].length : 0;
+			iFractionDigits = aMatches ? aMatches[1].replace(rTrailingZeros, "").length : 0;
 			iDecimals = this.mCustomUnits[sUnit].decimals;
 			if (iFractionDigits > iDecimals) {
 				throw this.getValidateException(iDecimals);

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

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise, bInactive) {
@@ -161,12 +161,17 @@ sap.ui.define([
 	 *
 	 * @param {object} [mParameters]
 	 *   For a persistent context, a map of parameters as specified for
-	 *   {@link sap.ui.model.odata.v2.ODataModel#remove}
+	 *   {@link sap.ui.model.odata.v2.ODataModel#remove}, except that the <code>groupId</code> and
+	 *   <code>changeSetId</code> parameters default to the values set via
+	 *   {@link sap.ui.model.odata.v2.ODataModel#setChangeGroups} for the type of the entity to be
+	 *   deleted.
 	 * @param {string} [mParameters.groupId]
 	 *   ID of a request group; requests belonging to the same group will be bundled in one batch
-	 *   request
+	 *   request. If not provided, the <code>groupId</code> defined for the type of the entity to be
+	 *   deleted is used.
 	 * @param {string} [mParameters.changeSetId]
-	 *   ID of the <code>ChangeSet</code> that this request should belong to
+	 *   ID of the <code>ChangeSet</code> that this request should belong to. If not provided, the
+	 *   <code>changeSetId</code> defined for the type of the entity to be deleted is used.
 	 * @param {boolean} [mParameters.refreshAfterChange]
 	 *   Defines whether to update all bindings after submitting this change operation,
 	 *   see {@link #setRefreshAfterChange}. If given, this overrules the model-wide
@@ -203,10 +208,14 @@ sap.ui.define([
 		}
 
 		return new Promise(function (resolve, reject) {
+			var oGroupInfo = oModel._resolveGroup(that.getPath());
+
 			oModel.remove("",
 				_Helper.merge({
+					changeSetId : oGroupInfo.changeSetId,
 					context : that,
 					error : reject,
+					groupId : oGroupInfo.groupId,
 					success : function () {resolve();}
 				}, mParameters));
 		});

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.101.0
+	 * @version 1.102.0
 	 *
 	 * @public
 	 * @since 1.37.0

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

@@ -57,9 +57,10 @@ sap.ui.define([
 	 * @param {boolean} [mParameters.faultTolerant] Turns on the fault tolerance mode, data is not reset if a back-end request returns an error
 	 * @param {sap.ui.model.odata.OperationMode} [mParameters.operationMode] Defines the operation mode of this binding
 	 * @param {string} [mParameters.select] Value for the OData <code>$select</code> query parameter which is included in the request
-	 * @param {int} [mParameters.threshold] Threshold that defines how many entries should be fetched at least
-	 *                                      by the binding if <code>operationMode</code> is set to <code>Auto</code>
-	 *                                      (See documentation for {@link sap.ui.model.odata.OperationMode.Auto})
+	 * @param {int} [mParameters.threshold]
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   the threshold that defines how many entries should be fetched at least by the binding if
+	 *   <code>operationMode</code> is set to <code>Auto</code>
 	 * @param {boolean} [mParameters.transitionMessagesOnly]
 	 *   Whether this list binding only requests transition messages from the back end. If messages
 	 *   for entities of this collection need to be updated, use
@@ -102,7 +103,7 @@ sap.ui.define([
 			this.sGroupId = undefined;
 			this.sRefreshGroupId = undefined;
 			this.bLengthRequested = false;
-			this.bUseExtendedChangeDetection = true;
+			this.bUseExtendedChangeDetection = false;
 			this.bFaultTolerant = mParameters && mParameters.faultTolerant;
 			this.bLengthFinal = false;
 			this.iLastEndIndex = 0;
@@ -188,6 +189,40 @@ sap.ui.define([
 		this.detachEvent("createActivate", fnFunction, oListener);
 	};
 
+	/**
+	 * This helper function must be called only by {@link #getContexts}. It updates
+	 * <code>iLastStartIndex</code>, <code>iLastLength</code> and
+	 * <code>iLastMaximumPrefetchSize</code> with the given start index, length and maximum prefetch
+	 * size. If <code>bKeepCurrent</code> is set, throw an error if keeping
+	 * current contexts untouched is not supported, otherwise don't update
+	 * <code>iLastStartIndex</code>, <code>iLastLength</code> and
+	 * <code>iLastMaximumPrefetchSize</code>.
+	 *
+	 * @param {int} [iStartIndex]
+	 *   The start index
+	 * @param {int} [iLength]
+	 *   The length
+	 * @param {int} [iMaximumPrefetchSize]
+	 *   The maximum number of contexts to read before and after the given range
+	 * @param {boolean} [bKeepCurrent]
+	 *   Whether the result of {@link #getCurrentContexts} keeps untouched
+	 * @throws {Error}
+	 *   If extended change detection is enabled and <code>bKeepCurrent</code> is set, or if
+	 *   <code>iMaximumPrefetchSize</code> and <code>bKeepCurrent</code> are set
+	 *
+	 * @private
+	 */
+	 ODataListBinding.prototype._updateLastStartAndLength = function (iStartIndex, iLength,
+			iMaximumPrefetchSize, bKeepCurrent) {
+		if (bKeepCurrent) {
+			this._checkKeepCurrentSupported(iMaximumPrefetchSize);
+		} else {
+			this.iLastStartIndex = iStartIndex;
+			this.iLastLength = iLength;
+			this.iLastMaximumPrefetchSize = iMaximumPrefetchSize;
+		}
+	};
+
 	/**
 	 * Returns all current contexts of this list binding in no special order. Just like
 	 * {@link #getCurrentContexts}, this method does not request any data from a back end and does
@@ -215,16 +250,29 @@ sap.ui.define([
 	/**
 	 * Return contexts for the list.
 	 *
-	 * @param {int} [iStartIndex] The start index of the requested contexts
-	 * @param {int} [iLength] The requested amount of contexts
-	 * @param {int} [iThreshold] The threshold value
+	 * @param {int} [iStartIndex=0]
+	 *   The index where to start the retrieval of contexts
+	 * @param {int} [iLength]
+	 *   The number of contexts to retrieve beginning from the start index; defaults to the model's
+	 *   size limit, see {@link sap.ui.model.Model#setSizeLimit}, or to the binding's final length
+	 * @param {int} [iMaximumPrefetchSize=0]
+	 *   The maximum number of contexts to read before and after the given range; with this,
+	 *   controls can prefetch data that is likely to be needed soon, e.g. when scrolling down in a
+	 *   table
+	 * @param {boolean} [bKeepCurrent]
+	 *   Whether this call keeps the result of {@link #getCurrentContexts} untouched; since 1.102.0.
 	 * @return {sap.ui.model.odata.v2.Context[]}
-	 *   The array of contexts for each row of the bound list
+	 *   The array of already available contexts with the first entry containing the context for
+	 *   <code>iStartIndex</code>
+	 * @throws {Error}
+	 *   If extended change detection is enabled and <code>bKeepCurrent</code> is set, or if
+	 *   <code>iMaximumPrefetchSize</code> and <code>bKeepCurrent</code> are set
+	 *
 	 * @protected
 	 */
-	ODataListBinding.prototype.getContexts = function(iStartIndex, iLength, iThreshold) {
-		var aContexts, oSkipAndTop,
-			aContextData = [];
+	ODataListBinding.prototype.getContexts = function(iStartIndex, iLength, iMaximumPrefetchSize,
+			bKeepCurrent) {
+		var aContexts, aContextData, oSkipAndTop;
 
 		if (this.bInitial || this._hasTransientParentContext()) {
 			return [];
@@ -247,25 +295,21 @@ sap.ui.define([
 		}
 
 		//this.bInitialized = true;
-		this.iLastLength = iLength;
-		this.iLastStartIndex = iStartIndex;
-		this.iLastThreshold = iThreshold;
-
-		//	Set default values if startindex, threshold or length are not defined
+		this._updateLastStartAndLength(iStartIndex, iLength, iMaximumPrefetchSize, bKeepCurrent);
 		if (!iStartIndex) {
 			iStartIndex = 0;
 		}
 		if (!iLength) {
 			iLength = this._getMaximumLength();
 		}
-		if (!iThreshold) {
-			iThreshold = 0;
+		if (!iMaximumPrefetchSize) {
+			iMaximumPrefetchSize = 0;
 		}
 
 		// re-set the threshold in OperationMode.Auto
 		if (this.sOperationMode == OperationMode.Auto) {
 			if (this.iThreshold >= 0) {
-				iThreshold = Math.max(this.iThreshold, iThreshold);
+				iMaximumPrefetchSize = Math.max(this.iThreshold, iMaximumPrefetchSize);
 			}
 		}
 		aContexts = this._getContexts(iStartIndex, iLength);
@@ -275,7 +319,7 @@ sap.ui.define([
 				aContexts.dataRequested = true;
 			}
 		} else {
-			oSkipAndTop = this._getSkipAndTop(iStartIndex, iLength, iThreshold);
+			oSkipAndTop = this._getSkipAndTop(iStartIndex, iLength, iMaximumPrefetchSize);
 			// check if metadata are already available
 			if (this.oModel.getServiceMetadata()) {
 				// If rows are missing send a request
@@ -299,9 +343,10 @@ sap.ui.define([
 			if (!aContexts.dataRequested && aContexts.length > 0) {
 				this._fireChange({reason : ChangeReason.Change});
 			}
-		} else {
+		} else if (!bKeepCurrent) {
 			// Do not create context data and diff in case of refresh, only if real data has been received
 			// The current behaviour is wrong and makes diff detection useless for OData in case of refresh
+			aContextData = [];
 			for (var i = 0; i < aContexts.length; i++) {
 				aContextData.push(this.getContextData(aContexts[i]));
 			}
@@ -311,9 +356,10 @@ sap.ui.define([
 					aContexts.diff = this.diffData(this.aLastContextData, aContextData);
 				}
 			}
+
 			this.iLastEndIndex = iStartIndex + iLength;
 			this.aLastContexts = aContexts.slice(0);
-			this.aLastContextData = aContextData.slice(0);
+			this.aLastContextData = aContextData;
 		}
 
 		return aContexts;
@@ -578,7 +624,6 @@ sap.ui.define([
 				if (this.aExpandRefs.sideEffects && !bOldUseExpandedList) {
 					// don't switch expanded list mode if data is read via a side effect
 					this.aExpandRefs = undefined;
-					this.aAllKeys = null;
 					this.bUseExpandedList = false;
 
 					return this.bUseExpandedList;
@@ -913,7 +958,7 @@ sap.ui.define([
 
 		// If length is not final and larger than zero, add some additional length to enable
 		// scrolling/paging for controls that only do this if more items are available
-		return iResult + (this.iLastThreshold || this.iLastLength || 10);
+		return iResult + (this.iLastMaximumPrefetchSize || this.iLastLength || 10);
 	};
 
 	/**
@@ -1349,6 +1394,33 @@ sap.ui.define([
 		return sPath && this.oModel._createRequestUrl(sPath, null, aParams);
 	};
 
+	/**
+	 * Appends the keys of a list binding's created persisted contexts to its <code>aAllKeys</code>.
+	 * Afterwards, the created persisted contexts are removed from the creation rows area.
+	 *
+	 * Note that this must only be used in <code>OperationMode.Client</code> as this mode expects
+	 * that <code>aAllKeys</code> knows the complete collection from server.
+	 *
+	 * @returns {boolean} Whether created persisted entries have been processed
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype._moveCreatedPersistedToAllKeys = function () {
+		var that = this,
+			aCreatedPersistedKeys = this._getCreatedPersistedContexts().map(function (oContext) {
+				return that.oModel.getKey(oContext);
+			});
+
+		if (aCreatedPersistedKeys.length) {
+			this.aAllKeys = this.aAllKeys.concat(aCreatedPersistedKeys);
+			this._removePersistedCreatedContexts();
+
+			return true;
+		}
+
+		return false;
+	};
+
 	/**
 	 * Sorts the list.
 	 *
@@ -1389,12 +1461,10 @@ sap.ui.define([
 			if (this.useClientMode()) {
 				// apply clientside sorters only if data is available
 				if (this.aAllKeys) {
-					// If no sorters are defined, restore initial sort order by calling applyFilter
-					if (aSorters.length == 0) {
+					if (this._moveCreatedPersistedToAllKeys() || !aSorters.length) {
 						this.applyFilter();
-					} else {
-						this.applySort();
 					}
+					this.applySort();
 					this._fireChange({reason: ChangeReason.Sort});
 				} else {
 					this.sChangeReason = ChangeReason.Sort;
@@ -1617,6 +1687,7 @@ sap.ui.define([
 			if (this.useClientMode()) {
 				// apply clientside filters/sorters only if data is available
 				if (this.aAllKeys) {
+					this._moveCreatedPersistedToAllKeys();
 					this.applyFilter();
 					this.applySort();
 					this._fireChange({reason: ChangeReason.Filter});
@@ -1974,13 +2045,14 @@ sap.ui.define([
 
 	/**
 	 * Gets an object with the values for system query options $skip and $top based on the given
-	 * start index (from control point of view), length and threshold. The number of entities
-	 * created via {@link #create} is considered for the <code>$skip</code> value if created at the
-	 * beginning, but it is not considered for the <code>$top</code> value.
+	 * start index (from control point of view), length and maximum prefetch size. The number of
+	 * entities created via {@link #create} is considered for the <code>$skip</code> value if
+	 * created at the beginning, but it is not considered for the <code>$top</code> value.
 	 *
 	 * @param {number} iStartIndex The start index from control point of view
 	 * @param {number} iLength The length
-	 * @param {number} iThreshold The threshold
+	 * @param {number} iMaximumPrefetchSize
+	 *   The maximum number of contexts to read before and after the given range
 	 * @returns {object}
 	 *   An object containing the properties <code>skip</code> and <code>top</code>; the values
 	 *   correspond to the system query options <code>$skip</code> and <code>$top</code>.
@@ -1988,7 +2060,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	ODataListBinding.prototype._getSkipAndTop = function (iStartIndex, iLength, iThreshold) {
+	ODataListBinding.prototype._getSkipAndTop = function (iStartIndex, iLength,
+			iMaximumPrefetchSize) {
 		var oInterval, aIntervals,
 			aCreatedContexts = this._getCreatedContexts(),
 			bFirstCreateAtStart = this.isFirstCreateAtEnd() === false,
@@ -1996,7 +2069,7 @@ sap.ui.define([
 				? aCreatedContexts.concat(this.aKeys)
 				: this.aKeys;
 
-		aIntervals = ODataUtils._getReadIntervals(aKeys, iStartIndex, iLength, iThreshold,
+		aIntervals = ODataUtils._getReadIntervals(aKeys, iStartIndex, iLength, iMaximumPrefetchSize,
 			/*iLimit*/this.bLengthFinal ? this.iLength : undefined);
 		oInterval = ODataUtils._mergeIntervals(aIntervals);