@openui5/sap.ui.core 1.130.0 → 1.131.0

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

@@ -15,6 +15,7 @@ sap.ui.define([
 	"./lib/_Helper",
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
+	"sap/ui/core/Messaging",
 	"sap/ui/model/Binding",
 	"sap/ui/model/ChangeReason",
 	"sap/ui/model/Filter",
@@ -25,8 +26,8 @@ sap.ui.define([
 	"sap/ui/model/Sorter",
 	"sap/ui/model/odata/OperationMode"
 ], function (Context, asODataParentBinding, _AggregationCache, _AggregationHelper, _Cache,
-		_GroupLock, _Helper, Log, SyncPromise, Binding, ChangeReason, Filter, FilterOperator,
-		FilterProcessor, FilterType, ListBinding, Sorter, OperationMode) {
+		_GroupLock, _Helper, Log, SyncPromise, Messaging, Binding, ChangeReason, Filter,
+		FilterOperator, FilterProcessor, FilterType, ListBinding, Sorter, OperationMode) {
 	"use strict";
 
 	var sClassName = "sap.ui.model.odata.v4.ODataListBinding",
@@ -42,7 +43,8 @@ sap.ui.define([
 			patchCompleted : true,
 			patchSent : true,
 			refresh : true,
-			selectionChanged : true
+			selectionChanged : true,
+			separateReceived : true
 		},
 		/**
 		 * @alias sap.ui.model.odata.v4.ODataListBinding
@@ -57,7 +59,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.130.0
+		 * @version 1.131.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
@@ -565,6 +567,36 @@ sap.ui.define([
 	 * @since 1.130.0
 	 */
 
+	/**
+	 * The 'separateReceived' event is fired when a separate property request (see '$$separate'
+	 * binding parameter of {@link sap.ui.model.odata.v4.ODataModel#bindList}) is completed. The
+	 * <code>start</code> and <code>length</code> parameters can be used to retrieve the received
+	 * data via {@link #requestContexts}.
+	 *
+	 * If the request fails, the <code>errorMessage</code> is a UI5 message containing the back-end
+	 * error. It is reported to the message model by default unless
+	 * {@link sap.ui.base.Event#preventDefault} is called.
+	 *
+	 * @param {sap.ui.base.Event} oEvent
+	 *   The event object
+	 * @param {sap.ui.model.odata.v4.ODataListBinding} oEvent.getSource()
+	 *   This binding
+	 * @param {function():Object<any>} oEvent.getParameters
+	 *   Function which returns an object containing all event parameters
+	 * @param {string} oEvent.getParameters.property
+	 *   The requested property name
+	 * @param {number} oEvent.getParameters.start
+	 *   The start index of the requested range
+	 * @param {number} oEvent.getParameters.length
+	 *   The length of the requested range
+	 * @param {sap.ui.core.message.Message} [oEvent.getParameters.errorMessage]
+	 *   A UI5 message of type {@link module:sap/ui/core/message/MessageType MessageType.Error}
+	 *
+	 * @event sap.ui.model.odata.v4.ODataListBinding#separateReceived
+	 * @experimental As of version 1.131.0
+	 * @public
+	 */
+
 	/**
 	 * Attach event handler <code>fnFunction</code> to the 'createActivate' event of this binding.
 	 *
@@ -1334,7 +1366,7 @@ sap.ui.define([
 		this.oDiff = undefined;
 		this.aFilters = undefined;
 		this.oHeaderContext = undefined;
-		// this.mParameters = undefined;
+		this.mParameters = undefined;
 		this.mPreviousContextsByPath = undefined;
 		this.aPreviousData = undefined;
 		this.mQueryOptions = undefined;
@@ -1787,7 +1819,7 @@ sap.ui.define([
 				}
 
 				return oCache.read(iIndex, iLength, iMaximumPrefetchSize, oGroupLock,
-					fnDataRequested
+					fnDataRequested, undefined, that.fireSeparateReceived.bind(that)
 				).then(function (oResult) {
 					oResult.$checkStillValid = that.checkSameCache.bind(that, oCache);
 
@@ -2388,6 +2420,34 @@ sap.ui.define([
 		this.fireEvent("selectionChanged", {context : oContext});
 	};
 
+	/**
+	 * Fires the 'separateReceived' event.
+	 *
+	 * @param {string} sProperty - The requested property name
+	 * @param {number} iStart - The start index of the requested range
+	 * @param {number} iEnd - The index after the requested range
+	 * @param {Error} [oError] - A back-end error
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.fireSeparateReceived = function (sProperty, iStart, iEnd, oError) {
+		const oParameters = {
+			property : sProperty,
+			start : iStart,
+			length : iEnd - iStart
+		};
+		if (oError) {
+			oParameters.errorMessage = this.oModel.reportTransitionMessages(
+				_Helper.extractMessages(oError), oError.resourcePath, /*bSilent*/true)[0];
+		}
+
+		const bDefaultAction = this.fireEvent("separateReceived", oParameters, true);
+
+		if (oError && bDefaultAction) {
+			Messaging.updateMessages(undefined, [oParameters.errorMessage]);
+		}
+	};
+
 	/**
 	 * Returns the current object holding the information needed for data aggregation, see
 	 * {@link #setAggregation}.
@@ -2557,8 +2617,8 @@ sap.ui.define([
 			bKeepCurrent) {
 		var sChangeReason,
 			aContexts,
-			bDataRequested = false,
 			bFireChange = false,
+			bFireDataReceived,
 			bPreventBubbling,
 			oPromise,
 			bRefreshEvent = !!this.sChangeReason, // ignored for "*VirtualContext"
@@ -2650,8 +2710,10 @@ sap.ui.define([
 			// make sure "refresh" is followed by async "change"
 			oPromise = this.fetchContexts(iStart, iLength, iMaximumPrefetchSize, undefined,
 				/*bAsync*/bRefreshEvent, function () {
-					bDataRequested = true;
-					that.fireDataRequested(bPreventBubbling);
+					if (bFireDataReceived === undefined) {
+						bFireDataReceived = true;
+						that.fireDataRequested(bPreventBubbling);
+					}
 				});
 			if (!bRefreshEvent && oPromise.isPending()) {
 				this.createContextsForCachedData(iStart, iLength);
@@ -2670,12 +2732,13 @@ sap.ui.define([
 						that.oDiff = undefined;
 					}
 				}
-				if (bDataRequested) {
+				if (bFireDataReceived) {
 					that.fireDataReceived({data : {}}, bPreventBubbling);
 				}
+				bFireDataReceived = false; // no subsequent #fireDataRequested allowed
 			}, function (oError) {
 				// cache shares promises for concurrent read
-				if (bDataRequested) {
+				if (bFireDataReceived) {
 					that.fireDataReceived(oError.canceled ? {data : {}} : {error : oError},
 						bPreventBubbling);
 				}

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

@@ -158,7 +158,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.130.0
+		 * @version 1.131.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -537,6 +537,7 @@ sap.ui.define([
 		// no need to use UI5Date.getInstance as only the timestamp is relevant
 		this.oLastModified = new Date(0);
 		this.oMetadataPromise = null;
+		this.oMetaModelForAnnotations = null; // see #_copyAnnotations
 		this.oModel = oModel;
 		this.mMetadataUrl2Promise = {};
 		this.oRequestor = oRequestor;
@@ -602,37 +603,73 @@ sap.ui.define([
 	};
 
 	/**
-	 * Changes the given map of annotations by applying the current array of change objects defining
-	 * a metamodel path (pointing to an annotation) and a value to be set for that annotation.
+	 * Changes the given scope's map of annotations by applying the current array of change objects
+	 * defining a metamodel path (pointing to an annotation) and a value to be set for that
+	 * annotation.
 	 *
-	 * @param {object} mAnnotations
-	 *   the root scope's $Annotations
+	 * Additionally imports annotations for all own schemas from
+	 * <code>oMetaModelForAnnotations</code>.
+	 *
+	 * @param {object} mScope
+	 *   The $metadata "JSON" of the root service
 	 *
 	 * @private
+	 * @see #_copyAnnotations
 	 */
-	ODataMetaModel.prototype._changeAnnotations = function (mAnnotations) {
+	ODataMetaModel.prototype._changeAnnotations = function (mScope) {
+		if (this.oMetaModelForAnnotations) {
+			Object.keys(mScope).forEach((sElement) => {
+				if (mScope[sElement].$kind === "Schema") {
+					this._doMergeAnnotations({
+						$Annotations
+							: this.oMetaModelForAnnotations._getAnnotationsForSchema(sElement)
+					}, mScope.$Annotations, true);
+				}
+			});
+		}
+
 		this.aAnnotationChanges?.forEach(({path : sPath, value : vValue}) => {
 			const iIndexOfAt = sPath.indexOf("@");
 			const sTarget = this.getObject(sPath.slice(0, iIndexOfAt) + "@$ui5.target");
 			if (sTarget) {
-				mAnnotations[sTarget] ??= {};
-				mAnnotations[sTarget][sPath.slice(iIndexOfAt)] = vValue;
+				mScope.$Annotations[sTarget] ??= {};
+				mScope.$Annotations[sTarget][sPath.slice(iIndexOfAt)] = vValue;
 			}
 		});
 	};
 
+	/**
+	 * Saves the meta model delivering annotations that have to be merged later.
+	 *
+	 * @param {sap.ui.model.odata.v4.ODataMetaModel} oMetaModel
+	 *   The meta model delivering annotations
+	 * @throws {Error}
+	 *   If there are local annotation files
+	 *
+	 * @private
+	 * @see #_changeAnnotations
+	 * @see #_getAnnotationsForSchema
+	 */
+	ODataMetaModel.prototype._copyAnnotations = function (oMetaModel) {
+		if (this.aAnnotationUris) {
+			throw new Error("Must not copy annotations when there are local annotation files");
+		}
+
+		this.oMetaModelForAnnotations = oMetaModel;
+	};
+
 	/**
 	 * Merges the given schema's annotations into the root scope's $Annotations.
 	 *
 	 * @param {object} oSchema
-	 *   a schema; schema children are ignored because they do not contain $Annotations
+	 *   A schema; schema children are ignored because they do not contain $Annotations
 	 * @param {object} mAnnotations
-	 *   the root scope's $Annotations
+	 *   The root scope's $Annotations
 	 * @param {boolean} [bPrivileged]
-	 *   whether the schema has been loaded from a privileged source and thus may overwrite
+	 *   Whether the schema has been loaded from a privileged source and thus may overwrite
 	 *   existing annotations
 	 * @returns {boolean}
-	 *   whether at least one annotation has been merged
+	 *   Whether at least one annotation has been merged
 	 *
 	 * @private
 	 */
@@ -657,9 +694,7 @@ sap.ui.define([
 		}
 
 		for (const sTarget in oSchema.$Annotations) {
-			if (!(sTarget in mAnnotations)) {
-				mAnnotations[sTarget] = {};
-			}
+			mAnnotations[sTarget] ??= {};
 			extend(mAnnotations[sTarget], oSchema.$Annotations[sTarget]);
 		}
 		delete oSchema.$Annotations;
@@ -667,6 +702,31 @@ sap.ui.define([
 		return bMerged;
 	};
 
+	/**
+	 * Gets all annotations targeting the given schema. The function expects that the metadata and
+	 * the local annotation files have already been loaded.
+	 *
+	 * @param {string} sSchema
+	 *   A namespace, for example "foo.bar.", of a schema
+	 * @returns {object}
+	 *   All annotations targeting the given schema
+	 *
+	 * @private
+	 * @see #_changeAnnotations
+	 * @see #_copyAnnotations
+	 */
+	ODataMetaModel.prototype._getAnnotationsForSchema = function (sSchema) {
+		const mAnnotations = {};
+		const mScope = this.fetchEntityContainer().getResult();
+		Object.keys(mScope.$Annotations).forEach((sTarget) => {
+			if (sTarget.startsWith(sSchema)) {
+				mAnnotations[sTarget] = mScope.$Annotations[sTarget];
+			}
+		});
+
+		return mAnnotations;
+	};
+
 	/**
 	 * Returns the schema with the given namespace, or a promise which is resolved as soon as the
 	 * schema has been included, or <code>undefined</code> in case the schema is neither present nor
@@ -675,7 +735,7 @@ sap.ui.define([
 	 * @param {object} mScope
 	 *   The $metadata "JSON" of the root service
 	 * @param {string} sSchema
-	 *   A namespace, for example "foo.bar.", of a schema.
+	 *   A namespace, for example "foo.bar.", of a schema
 	 * @param {function} fnLog
 	 *   The log function
 	 * @returns {object|sap.ui.base.SyncPromise|undefined}
@@ -715,7 +775,7 @@ sap.ui.define([
 				}
 			}
 			if (bMerged) {
-				that._changeAnnotations(mScope.$Annotations);
+				that._changeAnnotations(mScope);
 			}
 		}
 
@@ -942,6 +1002,17 @@ sap.ui.define([
 		throw new Error("Unsupported operation: v4.ODataMetaModel#bindTree");
 	};
 
+	/**
+	 * Destroys this meta model.
+	 *
+	 * @private
+	 */
+	ODataMetaModel.prototype.destroy = function () {
+		this.oMetaModelForAnnotations = undefined;
+
+		MetaModel.prototype.destroy.apply(this);
+	};
+
 	/**
 	 * Returns a promise for an absolute data binding path of a "4.3.1 Canonical URL" for the given
 	 * context.
@@ -1028,7 +1099,7 @@ sap.ui.define([
 				// apply annotation changes before anyone else has access, but after the promise has
 				// already resolved (else #fetchObject cannot really be used)
 				this.oMetadataPromise.then(
-					(mScope) => this._changeAnnotations(mScope.$Annotations),
+					(mScope) => this._changeAnnotations(mScope),
 					() => { /* avoid "Uncaught (in promise)" */ });
 			}
 		}
@@ -2422,7 +2493,8 @@ sap.ui.define([
 	/**
 	 * Creates an OData model for the given URL, normalizes the path, caches it, and retrieves it
 	 * from the cache upon further requests. The model is read-only ("OneWay") and can, thus, safely
-	 * be shared. It shares this meta model's security token.
+	 * be shared. It shares this meta model's security token. The function expects that the metadata
+	 * and the local annotation files have already been loaded.
 	 *
 	 * @param {string} sUrl
 	 *   The (relative) $metadata URL, for example "../ValueListService/$metadata"
@@ -2452,6 +2524,8 @@ sap.ui.define([
 				serviceUrl : sUrl,
 				sharedRequests : true
 			});
+			oSharedModel.getMetaModel()._copyAnnotations(this.oMetaModelForAnnotations ?? this);
+
 			mSharedModelByUrl.set(sCacheKey, oSharedModel);
 		}
 		return oSharedModel;

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

@@ -240,7 +240,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.130.0
+		 * @version 1.131.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -357,10 +357,11 @@ sap.ui.define([
 		this.mMetadataHeaders = {"Accept-Language" : sLanguageTag};
 
 		mQueryParams = Object.assign({}, mUriParameters, mParameters.metadataUrlParams);
+		const fnGetOrCreateRetryAfterPromise = this.getOrCreateRetryAfterPromise.bind(this);
 		this.oMetaModel = new ODataMetaModel(
 			_MetadataRequestor.create(this.mMetadataHeaders, sODataVersion,
 				mParameters.ignoreAnnotationsFromMetadata, mQueryParams,
-				mParameters.withCredentials),
+				mParameters.withCredentials, fnGetOrCreateRetryAfterPromise),
 			this.sServiceUrl + "$metadata", mParameters.annotationURI, this,
 			mParameters.supportReferences, mQueryParams["sap-language"]);
 		this.oInterface = {
@@ -374,10 +375,8 @@ sap.ui.define([
 			getGroupProperty : this.getGroupProperty.bind(this),
 			getMessagesByPath : this.getMessagesByPath.bind(this),
 			getOptimisticBatchEnabler : this.getOptimisticBatchEnabler.bind(this),
+			getOrCreateRetryAfterPromise : fnGetOrCreateRetryAfterPromise,
 			getReporter : this.getReporter.bind(this),
-			getRetryAfterHandler : function () {
-				return that.fnRetryAfter;
-			},
 			isIgnoreETag : function () {
 				return that.bIgnoreETag;
 			},
@@ -430,6 +429,7 @@ sap.ui.define([
 		// ensure the events are respectively fired once for a GET request
 		this.mPath2DataRequestedCount = {};
 		this.fnRetryAfter = null;
+		this.oRetryAfterPromise = null;
 	}
 
 	/**
@@ -1644,6 +1644,8 @@ sap.ui.define([
 		this.oRequestor.destroy();
 		this.mHeaders = undefined;
 		this.mMetadataHeaders = undefined;
+		this.oRetryAfterPromise = undefined;
+
 		return Model.prototype.destroy.apply(this, arguments);
 	};
 
@@ -2094,6 +2096,35 @@ sap.ui.define([
 		return this.fnOptimisticBatchEnabler;
 	};
 
+	/**
+	 * Returns the promise that is currently being used for "Retry-After" handling. Returns
+	 * <code>null</code> if no "Retry-After" is currently known. Creates a new promise if there is
+	 * none, an error is given, and a {@link #setRetryAfterHandler handler} is known.
+	 *
+	 * @param {Error} [oRetryAfterError] - A "Retry-After" error from a back-end call
+	 * @returns {Promise|null} The current "Retry-After" promise
+	 *
+	 * @private
+	 */
+	ODataModel.prototype.getOrCreateRetryAfterPromise = function (oRetryAfterError) {
+		if (!this.oRetryAfterPromise && this.fnRetryAfter && oRetryAfterError) {
+			this.oRetryAfterPromise = this.fnRetryAfter(oRetryAfterError);
+			this.oRetryAfterPromise.finally(() => {
+				this.oRetryAfterPromise = null;
+			}).catch(() => { /* catch is only needed due to finally */ });
+			this.oRetryAfterPromise.catch((oError) => {
+				// own error reason is not reported to the message model
+				if (oError === oRetryAfterError) {
+					this.reportError(oError.message, sClassName, oError);
+				} else {
+					oError.$reported = true;
+				}
+			});
+		}
+
+		return this.oRetryAfterPromise;
+	};
+
 	/**
 	 * Method not supported
 	 *
@@ -2594,10 +2625,15 @@ sap.ui.define([
 	 *   The resource path of the cache that saw the messages; used to resolve the longtext URL and
 	 *   for adjusting a message target in case it is an operation parameter, except the binding
 	 *   parameter
+	 * @param {boolean} [bSilent]
+	 *   Whether the created UI5 messages should only be returned without reporting them
+	 * @returns {sap.ui.core.message.Message[]|undefined}
+	 *   An array of <code>aMessages</code> transformed to UI5 message instances, or
+	 *   <code>undefined</code> in case there are no messages
 	 *
 	 * @private
 	 */
-	ODataModel.prototype.reportTransitionMessages = function (aMessages, sResourcePath) {
+	ODataModel.prototype.reportTransitionMessages = function (aMessages, sResourcePath, bSilent) {
 		var sContextPath, oOperationMetadata;
 
 		if (!aMessages.length) {
@@ -2617,7 +2653,7 @@ sap.ui.define([
 			}
 		}
 
-		Messaging.updateMessages(undefined, aMessages.map((oMessage) => {
+		const aUI5Messages = aMessages.map((oMessage) => {
 			const oOriginalMessage = oMessage;
 			if (oOperationMetadata) {
 				oMessage = _Helper.clone(oMessage);
@@ -2627,7 +2663,12 @@ sap.ui.define([
 			oMessage.transition = true;
 
 			return this.createUI5Message(oMessage, sResourcePath, undefined, oOriginalMessage);
-		}));
+		});
+		if (!bSilent) {
+			Messaging.updateMessages(undefined, aUI5Messages);
+		}
+
+		return aUI5Messages;
 	};
 
 	/**

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

@@ -644,10 +644,12 @@ sap.ui.define([
 	 * @since 1.61
 	 */
 	ODataParentBinding.prototype.destroy = function () {
-		// this.mAggregatedQueryOptions = undefined;
+		this.mAggregatedQueryOptions = undefined;
 		this.aChildCanUseCachePromises = [];
 		this.removeReadGroupLock();
+		this.oRefreshPromise = undefined;
 		this.oResumePromise = undefined;
+		this.mCanUseCachePromiseByChildPath = undefined;
 
 		asODataBinding.prototype.destroy.call(this);
 	};

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.130.0
+		 * @version 1.131.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
@@ -388,6 +388,7 @@ sap.ui.define([
 		this.oModel.bindingDestroyed(this);
 		this.oCheckUpdateCallToken = undefined;
 		this.mQueryOptions = undefined;
+		this.mScope = undefined;
 		this.vValue = undefined;
 
 		asODataBinding.prototype.destroy.call(this);

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

@@ -408,6 +408,9 @@ sap.ui.define([
 		let iRemaining = iCount; // with bAll this is the count of the direct children in the end
 		for (let i = iIndex + 1; i < iIndex + 1 + iRemaining; i += 1) {
 			const oElement = aElements[i];
+			if (_Helper.hasPrivateAnnotation(oElement, "placeholder")) {
+				continue;
+			}
 			if (bAll && oElement["@$ui5.node.isExpanded"]) {
 				iRemaining -= this.collapse(
 					_Helper.getPrivateAnnotation(oElement, "predicate"), oGroupLock, true);
@@ -1881,10 +1884,11 @@ sap.ui.define([
 
 		iLength += iPrefetchLength; // "after the given range"
 
+		const iOutOfPlaceCount = this.oTreeState.getOutOfPlaceCount();
 		// "before the given range"
 		// after a side-effects refresh out-of-place nodes may shift the visible range, we have
 		// to read as many nodes before this range to be on the safe side
-		iPrefetchLength = Math.max(iPrefetchLength, this.oTreeState.getOutOfPlaceCount());
+		iPrefetchLength = Math.max(iPrefetchLength, iOutOfPlaceCount);
 		if (iStart > iPrefetchLength) {
 			iLength += iPrefetchLength;
 			iStart -= iPrefetchLength;
@@ -1895,12 +1899,19 @@ sap.ui.define([
 
 		// Note: this.oFirstLevel.read changes this value
 		const bSentRequest = this.oFirstLevel.bSentRequest;
+		if (bSentRequest && iOutOfPlaceCount) { // cannot handle result below, avoid new request
+			oGroupLock = _GroupLock.$cached;
+		}
 
 		return SyncPromise.all([
 				this.oFirstLevel.read(iStart, iLength, 0, oGroupLock, fnDataRequested),
 				// request out-of-place nodes only once
 				...(bSentRequest ? [] : this.requestOutOfPlaceNodes(oGroupLock))
 			]).then(function ([oResult, ...aOutOfPlaceResults]) {
+				if (bSentRequest && iOutOfPlaceCount) {
+					return; // not idempotent due to previous #handleOutOfPlaceNodes
+				}
+
 				// Note: this code must be idempotent, it might well run twice!
 				var oGrandTotal,
 					oGrandTotalCopy,