@openui5/sap.ui.fl 1.115.1 → 1.116.0

package/src/sap/ui/fl/apply/_internal/DelegateMediator.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @experimental Since 1.80 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.
@@ -57,7 +57,7 @@ sap.ui.define([
 	function getDefaultDelegateInfo(oControl, sModelType) {
 		sModelType = getModelTypeForControl(oControl, sModelType);
 		var aDelegateInfo = DelegateMediator._mDefaultDelegateItems[sModelType];
-		return (aDelegateInfo || []).map(function (mDelegateInfo) {
+		return (aDelegateInfo || []).map(function(mDelegateInfo) {
 			mDelegateInfo.payload = {};
 			return mDelegateInfo;
 		});
@@ -65,27 +65,27 @@ sap.ui.define([
 
 	function loadDelegates(oModifier, oControl, aDelegates) {
 		if (!aDelegates.length) {
-			//it is a valid case to ask for a delegate and there is none
-			//a broken delegate is logged below
+			// it is a valid case to ask for a delegate and there is none
+			// a broken delegate is logged below
 			return Promise.resolve([]);
 		}
 		var aPromises = [];
-		aDelegates.forEach(function (mDelegateInfo) {
-			aPromises.push(function (aLoadedDelegates) {
+		aDelegates.forEach(function(mDelegateInfo) {
+			aPromises.push(function(aLoadedDelegates) {
 				return requireAsync(mDelegateInfo.name)
-					.then(function (oDelegate) {
-						mDelegateInfo.instance = oDelegate || {};
-						aLoadedDelegates.push(mDelegateInfo);
-						return aLoadedDelegates;
-					})
-					.catch(function(oError) {
-						Log.error("Failed to load the delegate for the control " + oModifier.getId(oControl) +
+				.then(function(oDelegate) {
+					mDelegateInfo.instance = oDelegate || {};
+					aLoadedDelegates.push(mDelegateInfo);
+					return aLoadedDelegates;
+				})
+				.catch(function(oError) {
+					Log.error("Failed to load the delegate for the control " + oModifier.getId(oControl) +
 							"\n" + oError.message);
-						return aLoadedDelegates;
-					});
+					return aLoadedDelegates;
+				});
 			});
 		});
-		return aPromises.reduce(function (oPreviousPromise, oCurrentPromise) {
+		return aPromises.reduce(function(oPreviousPromise, oCurrentPromise) {
 			return oPreviousPromise.then(oCurrentPromise);
 		}, Promise.resolve([]));
 	}
@@ -122,6 +122,9 @@ sap.ui.define([
 			// is available maximum once for instancespecific delegate
 			mTargetDelegateInfo.payload = mDelegateInfo.payload;
 		}
+		if (mDelegateInfo.delegateType) {
+			mTargetDelegateInfo.delegateType = mDelegateInfo.delegateType;
+		}
 		return mTargetDelegateInfo;
 	}
 
@@ -173,7 +176,7 @@ sap.ui.define([
 	}
 
 	function validateInputParameters(oControl, oModifier) {
-		return new Promise(function (resolve, reject) {
+		return new Promise(function(resolve, reject) {
 			if (!oControl) {
 				reject(new Error("The control parameter is missing"));
 			}
@@ -194,14 +197,14 @@ sap.ui.define([
 	}
 
 	function isValidType(mPropertyBag) {
-		return Object.values(DelegateMediator.types).some(function (sDelegateMediatorType) {
+		return Object.values(DelegateMediator.types).some(function(sDelegateMediatorType) {
 			return sDelegateMediatorType === mPropertyBag.delegateType;
 		});
 	}
 
 	function isCompetingDelegateAlreadyRegistered(mPropertyBag) {
 		var aDefaultDelegates = DelegateMediator._mDefaultDelegateItems[mPropertyBag.modelType] || [];
-		var aDefaultDelegateTypes = aDefaultDelegates.map(function (mDefaultDelegateInfo) {
+		var aDefaultDelegateTypes = aDefaultDelegates.map(function(mDefaultDelegateInfo) {
 			return mDefaultDelegateInfo.delegateType;
 		});
 		return aDefaultDelegateTypes.indexOf(DelegateMediator.types.COMPLETE) > -1
@@ -209,7 +212,7 @@ sap.ui.define([
 			|| (mPropertyBag.delegateType === DelegateMediator.types.COMPLETE && aDefaultDelegateTypes.length);
 	}
 
-	DelegateMediator.getKnownDefaultDelegateLibraries = function () {
+	DelegateMediator.getKnownDefaultDelegateLibraries = function() {
 		return ["sap.ui.comp"]; // OdataV2Delegate is defined in sap.ui.comp
 	};
 
@@ -222,10 +225,10 @@ sap.ui.define([
 	 * @param {string} [sModelType] - Model type, if none is provided the default model of oControl is taken instead
 	 * @returns {string[]} Required libraries
 	 */
-	DelegateMediator.getRequiredLibrariesForDefaultDelegate = function (aDelegateNames, oControl, sModelType) {
+	DelegateMediator.getRequiredLibrariesForDefaultDelegate = function(aDelegateNames, oControl, sModelType) {
 		sModelType = getModelTypeForControl(oControl, sModelType);
 		var aDelegateInfo = DelegateMediator._mDefaultDelegateItems[sModelType] || [];
-		return aDelegateInfo.reduce(function (aRequiredLibNames, mDelegateInfo) {
+		return aDelegateInfo.reduce(function(aRequiredLibNames, mDelegateInfo) {
 			var bIsDefaultDelegate = aDelegateNames.indexOf(mDelegateInfo.name) > -1;
 			return aRequiredLibNames.concat(Object.keys((bIsDefaultDelegate && mDelegateInfo.requiredLibraries) || {}));
 		}, []);
@@ -237,7 +240,7 @@ sap.ui.define([
 	 * @param {string} sModelType - Delegate model type
 	 * @returns {boolean} <code>true</code> if a delegate is already registered for the model type
 	 */
-	DelegateMediator.isDelegateRegistered = function (sModelType) {
+	DelegateMediator.isDelegateRegistered = function(sModelType) {
 		return !!DelegateMediator._mDefaultDelegateItems[sModelType];
 	};
 
@@ -250,7 +253,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.delegateType - Defines the type of the default delegate. Please look at <code>DelegageMediator.types</code> for possible entries
 	 * @param {object} [mPropertyBag.requiredLibraries] - map of required libraries
 	 */
-	DelegateMediator.registerDefaultDelegate = function (mPropertyBag) {
+	DelegateMediator.registerDefaultDelegate = function(mPropertyBag) {
 		if (!(mPropertyBag.modelType && mPropertyBag.delegate)) {
 			throw new Error("'modelType' and 'delegate' properties are required for registration!");
 		}
@@ -282,23 +285,23 @@ sap.ui.define([
 	 * @param {boolean} [bSupportsDefault] - Include default delegate if no instance specific delegate is available
 	 * @returns {Promise.<sap.ui.core.util.reflection.FlexDelegateInfo>} Delegate information including the lazy loaded instance of the delegate
 	 */
-	DelegateMediator.getDelegateForControl = function (oControl, oModifier, sModelType, bSupportsDefault) {
+	DelegateMediator.getDelegateForControl = function(oControl, oModifier, sModelType, bSupportsDefault) {
 		return validateInputParameters(oControl, oModifier)
-			.then(function () {
-				return oModifier.getFlexDelegate(oControl);
-			})
-			.then(function (mInstanceSpecificDelegate) {
-				var aDelegateInfo = (bSupportsDefault && getDefaultDelegateInfo(oControl, sModelType)) || [];
-				if (mInstanceSpecificDelegate) {
-					//instance specific delegate always takes over
-					aDelegateInfo.push(mInstanceSpecificDelegate);
-				}
-				return loadDelegates(oModifier, oControl, aDelegateInfo);
-			})
-			.then(mergeDelegates.bind(this));
+		.then(function() {
+			return oModifier.getFlexDelegate(oControl);
+		})
+		.then(function(mInstanceSpecificDelegate) {
+			var aDelegateInfo = (bSupportsDefault && getDefaultDelegateInfo(oControl, sModelType)) || [];
+			if (mInstanceSpecificDelegate) {
+				// instance specific delegate always takes over
+				aDelegateInfo.push(mInstanceSpecificDelegate);
+			}
+			return loadDelegates(oModifier, oControl, aDelegateInfo);
+		})
+		.then(mergeDelegates.bind(this));
 	};
 
-	DelegateMediator.clear = function () {
+	DelegateMediator.clear = function() {
 		DelegateMediator._mDefaultDelegateItems = {};
 	};
 

package/src/sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes.js

@@ -5,7 +5,7 @@
  */
 
 sap.ui.define([
-], function (
+], function(
 ) {
 	"use strict";
 

package/src/sap/ui/fl/apply/_internal/changes/Applier.js

@@ -23,7 +23,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var oLastPromise = new FlUtils.FakePromise();
+	var oLastPromise = (FlUtils.FakePromise ? new FlUtils.FakePromise() : Promise.resolve());
 
 	function checkControlAndDependentSelectorControls(oChange, mPropertyBag) {
 		var oSelector = oChange.getSelector && oChange.getSelector();
@@ -38,22 +38,26 @@ sap.ui.define([
 		}
 
 		return mPropertyBag.modifier.bySelectorTypeIndependent(oSelector, mPropertyBag.appComponent, mPropertyBag.view)
-			.then(function (oControl) {
-				if (!oControl) {
-					throw Error("A flexibility change tries to change a nonexistent control.");
+		.then(function(oControl) {
+			if (!oControl) {
+				throw Error("A flexibility change tries to change a nonexistent control.");
+			}
+			checkFailedSelectors(oSelector);
+
+			var aDependentControlSelectorList = oChange.getDependentControlSelectorList();
+			aDependentControlSelectorList.forEach(function(oDependentControlSelector) {
+				var oDependentControl = mPropertyBag.modifier.bySelector(
+					oDependentControlSelector,
+					mPropertyBag.appComponent,
+					mPropertyBag.view
+				);
+				if (!oDependentControl) {
+					throw new Error("A dependent selector control of the flexibility change is not available.");
 				}
-				checkFailedSelectors(oSelector);
-
-				var aDependentControlSelectorList = oChange.getDependentControlSelectorList();
-				aDependentControlSelectorList.forEach(function(oDependentControlSelector) {
-					var oDependentControl = mPropertyBag.modifier.bySelector(oDependentControlSelector, mPropertyBag.appComponent, mPropertyBag.view);
-					if (!oDependentControl) {
-						throw new Error("A dependent selector control of the flexibility change is not available.");
-					}
-					checkFailedSelectors(oDependentControlSelector);
-				});
-				return oControl;
+				checkFailedSelectors(oDependentControlSelector);
 			});
+			return oControl;
+		});
 	}
 
 	function isXmlModifier(mPropertyBag) {
@@ -107,28 +111,28 @@ sap.ui.define([
 
 	function handleAfterApply(oChange, mControl, oInitializedControl, mPropertyBag) {
 		return Promise.resolve()
-			.then(function () {
-				// changeHandler can return a different control, e.g. case where a visible UI control replaces the stashed control placeholder
-				if (oInitializedControl instanceof Element) {
-					// the newly rendered control could have custom data set from the XML modifier
-					mControl.control = oInitializedControl;
-				}
-				if (mControl.control) {
-					return mPropertyBag.modifier.updateAggregation(mControl.originalControl, oChange.getContent().boundAggregation);
-				}
-				return undefined;
-			})
-			.then(function () {
-				// only save the revert data in the custom data when the change is being processed in XML,
-				// as it's only relevant for viewCache at the moment
-				return FlexCustomData.addAppliedCustomData(mControl.control, oChange, mPropertyBag, isXmlModifier(mPropertyBag));
-			})
-			.then(function () {
-				// if a change was reverted previously remove the flag as it is not reverted anymore
-				var oResult = {success: true};
-				oChange.markSuccessful(oResult);
-				return oResult;
-			});
+		.then(function() {
+			// changeHandler can return a different control, e.g. case where a visible UI control replaces the stashed control placeholder
+			if (oInitializedControl instanceof Element) {
+				// the newly rendered control could have custom data set from the XML modifier
+				mControl.control = oInitializedControl;
+			}
+			if (mControl.control) {
+				return mPropertyBag.modifier.updateAggregation(mControl.originalControl, oChange.getContent().boundAggregation);
+			}
+			return undefined;
+		})
+		.then(function() {
+			// only save the revert data in the custom data when the change is being processed in XML,
+			// as it's only relevant for viewCache at the moment
+			return FlexCustomData.addAppliedCustomData(mControl.control, oChange, mPropertyBag, isXmlModifier(mPropertyBag));
+		})
+		.then(function() {
+			// if a change was reverted previously remove the flag as it is not reverted anymore
+			var oResult = {success: true};
+			oChange.markSuccessful(oResult);
+			return oResult;
+		});
 	}
 
 	function handleAfterApplyError(oError, oChange, mControl, mPropertyBag) {
@@ -141,27 +145,42 @@ sap.ui.define([
 		var sCustomDataIdentifier = FlexCustomData.getCustomDataIdentifier(false, bErrorOccurred, bXmlModifier);
 		switch (sCustomDataIdentifier) {
 			case FlexCustomData.notApplicableChangesCustomDataKey:
-				FlUtils.formatAndLogMessage("info", [sLogMessage, oError.message], [sChangeId]);
+				FlUtils.formatAndLogMessage(
+					"info",
+					[sLogMessage, oError.message],
+					[sChangeId]
+				);
 				break;
 			case FlexCustomData.failedChangesCustomDataKeyXml:
-				FlUtils.formatAndLogMessage("warning", [sLogMessage, "Merge error detected while processing the XML tree."], [sChangeId], oError.stack);
+				FlUtils.formatAndLogMessage(
+					"warning",
+					[sLogMessage, "Merge error detected while processing the XML tree."],
+					[sChangeId],
+					oError.stack
+				);
 				break;
 			case FlexCustomData.failedChangesCustomDataKeyJs:
-				FlUtils.formatAndLogMessage("error", [sLogMessage, "Merge error detected while processing the JS control tree."], [sChangeId], oError.stack);
+				FlUtils.formatAndLogMessage(
+					"error",
+					[sLogMessage, "Merge error detected while processing the JS control tree."],
+					[sChangeId],
+					oError.stack
+				);
 				break;
-			/*no default*/
+			default:
+				// no default
 		}
 		return FlexCustomData.addFailedCustomData(mControl.control, oChange, mPropertyBag, sCustomDataIdentifier)
-			.then(function () {
-				// if the change failed during XML processing, the status has to be reset
-				// the change will be applied again in JS
-				if (bXmlModifier) {
-					oChange.setInitialApplyState();
-				} else {
-					oChange.markFailed(oResult);
-				}
-				return oResult;
-			});
+		.then(function() {
+			// if the change failed during XML processing, the status has to be reset
+			// the change will be applied again in JS
+			if (bXmlModifier) {
+				oChange.setInitialApplyState();
+			} else {
+				oChange.markFailed(oResult);
+			}
+			return oResult;
+		});
 	}
 
 	function logApplyChangeError(oError, oChange) {
@@ -210,7 +229,7 @@ sap.ui.define([
 	}
 
 	function registerOnAfterXMLChangeProcessingHandler(aOnAfterXMLChangeProcessingHandlers, oChangeHandler, oControl) {
-		var iChangeHandlerIndex = aOnAfterXMLChangeProcessingHandlers.findIndex(function (mHandler) {
+		var iChangeHandlerIndex = aOnAfterXMLChangeProcessingHandlers.findIndex(function(mHandler) {
 			return mHandler.handler === oChangeHandler;
 		});
 		if (iChangeHandlerIndex < 0) {
@@ -232,7 +251,7 @@ sap.ui.define([
 		 * @param {Promise} oPromise - Promise which is resolved when precondition fulfilled
 		 */
 		addPreConditionForInitialChangeApplying: function(oPromise) {
-			oLastPromise = oLastPromise.then(function () {
+			oLastPromise = oLastPromise.then(function() {
 				return oPromise;
 			});
 		},
@@ -268,7 +287,7 @@ sap.ui.define([
 						return oResult;
 					});
 				} else if (!oChange.isApplyProcessFinished()) {
-					return new FlUtils.FakePromise().then(function() {
+					return (FlUtils.FakePromise ? new FlUtils.FakePromise() : Promise.resolve()).then(function() {
 						oChange.startApplying();
 						return oChangeHandler.applyChange(oChange, mControl.control, mPropertyBag);
 					})
@@ -315,7 +334,7 @@ sap.ui.define([
 				view: FlUtils.getViewForControl(oControl)
 			};
 
-			aChangesForControl.forEach(function (oChange) {
+			aChangesForControl.forEach(function(oChange) {
 				checkAndAdjustChangeStatus(oControl, oChange, mChangesMap, oFlexController, mPropertyBag);
 				if (!oChange.isApplyProcessFinished() && !oChange._ignoreOnce) {
 					oChange.setQueuedForApply();
@@ -334,8 +353,9 @@ sap.ui.define([
 					bControlWithDependencies = true;
 				}
 
-				aChangesForControl.forEach(function (oChange) {
-					// in the ExtensionPoint scenario changes can get cloned, in case of a template change the original selector has to be adjusted
+				aChangesForControl.forEach(function(oChange) {
+					// in the ExtensionPoint scenario changes can get cloned,
+					// in case of a template change the original selector has to be adjusted
 					if (oChange.originalSelectorToBeAdjusted) {
 						adjustOriginalSelector(oChange, oControl, oAppComponent);
 						delete oChange.originalSelectorToBeAdjusted;
@@ -357,7 +377,7 @@ sap.ui.define([
 				});
 
 				if (aChangesForControl.length || bControlWithDependencies) {
-					return FlUtils.execPromiseQueueSequentially(aPromiseStack).then(function () {
+					return FlUtils.execPromiseQueueSequentially(aPromiseStack).then(function() {
 						return DependencyHandler.processDependentQueue(mChangesMap, oAppComponent, sControlId);
 					});
 				}
@@ -391,50 +411,50 @@ sap.ui.define([
 			return aChanges.reduce(function(oPreviousPromise, oChange) {
 				var oControl;
 				return oPreviousPromise
-					.then(checkControlAndDependentSelectorControls.bind(null, oChange, mPropertyBag))
-					.then(function (oReturnedControl) {
-						oControl = oReturnedControl;
-						var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
-						return Utils.getChangeHandler(oChange, mControl, mPropertyBag);
-					})
-					.then(function (oChangeHandler) {
-						mPropertyBag.changeHandler = oChangeHandler;
-						oChange.setQueuedForApply();
-						checkAndAdjustChangeStatus(oControl, oChange, undefined, undefined, mPropertyBag);
-
-						if (!oChange.isApplyProcessFinished()) {
-							if (typeof mPropertyBag.changeHandler.onAfterXMLChangeProcessing === "function") {
-								registerOnAfterXMLChangeProcessingHandler(
-									aOnAfterXMLChangeProcessingHandlers,
-									mPropertyBag.changeHandler,
-									oControl
-								);
-							}
-							return Applier.applyChangeOnControl(oChange, oControl, mPropertyBag);
+				.then(checkControlAndDependentSelectorControls.bind(null, oChange, mPropertyBag))
+				.then(function(oReturnedControl) {
+					oControl = oReturnedControl;
+					var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
+					return Utils.getChangeHandler(oChange, mControl, mPropertyBag);
+				})
+				.then(function(oChangeHandler) {
+					mPropertyBag.changeHandler = oChangeHandler;
+					oChange.setQueuedForApply();
+					checkAndAdjustChangeStatus(oControl, oChange, undefined, undefined, mPropertyBag);
+
+					if (!oChange.isApplyProcessFinished()) {
+						if (typeof mPropertyBag.changeHandler.onAfterXMLChangeProcessing === "function") {
+							registerOnAfterXMLChangeProcessingHandler(
+								aOnAfterXMLChangeProcessingHandlers,
+								mPropertyBag.changeHandler,
+								oControl
+							);
 						}
-						return {success: true};
-					})
-					.then(function(oReturn) {
-						if (!oReturn.success) {
-							throw Error(oReturn.error);
+						return Applier.applyChangeOnControl(oChange, oControl, mPropertyBag);
+					}
+					return {success: true};
+				})
+				.then(function(oReturn) {
+					if (!oReturn.success) {
+						throw Error(oReturn.error);
+					}
+				})
+				.catch(function(oError) {
+					oChange.getDependentSelectorList().forEach(function(oDependentControlSelector) {
+						if (FlUtils.indexOfObject(mPropertyBag.failedSelectors, oDependentControlSelector) === -1) {
+							mPropertyBag.failedSelectors.push(oDependentControlSelector);
 						}
-					})
-					.catch(function(oError) {
-						oChange.getDependentSelectorList().forEach(function(oDependentControlSelector) {
-							if (FlUtils.indexOfObject(mPropertyBag.failedSelectors, oDependentControlSelector) === -1) {
-								mPropertyBag.failedSelectors.push(oDependentControlSelector);
-							}
-						});
-						logApplyChangeError(oError, oChange);
 					});
-			}, new FlUtils.FakePromise())
+					logApplyChangeError(oError, oChange);
+				});
+			}, (FlUtils.FakePromise ? new FlUtils.FakePromise() : Promise.resolve()))
 			.then(function() {
 				delete mPropertyBag.failedSelectors;
 
 				// Once all changes for a control are processed, call the
 				// onAfterXMLChangeProcessing hooks of all involved change handlers
-				aOnAfterXMLChangeProcessingHandlers.forEach(function (mHandler) {
-					mHandler.controls.forEach(function (oControl) {
+				aOnAfterXMLChangeProcessingHandlers.forEach(function(mHandler) {
+					mHandler.controls.forEach(function(oControl) {
 						try {
 							mHandler.handler.onAfterXMLChangeProcessing(oControl, mPropertyBag);
 						} catch (oError) {

package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexCustomData
 	 * @experimental Since 1.61.0
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 */
 	var FlexCustomData = {};
 

package/src/sap/ui/fl/apply/_internal/changes/Reverter.js

@@ -77,7 +77,7 @@ sap.ui.define([
 			}
 			return undefined;
 		})
-		.then(function () {
+		.then(function() {
 			oChange.markRevertFinished();
 			return mControl.control;
 		})
@@ -109,7 +109,7 @@ sap.ui.define([
 				var oControl = mPropertyBag.modifier.bySelector(oSelector, mPropertyBag.appComponent);
 				if (!oControl) {
 					Log.warning("A flexibility change tries to revert changes on a nonexistent control with id " + oSelector.id);
-					return new FlUtils.FakePromise();
+					return (FlUtils.FakePromise ? new FlUtils.FakePromise() : Promise.resolve());
 				}
 				var mRevertProperties = {
 					modifier: mPropertyBag.modifier,

package/src/sap/ui/fl/apply/_internal/changes/Utils.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.Utils
 	 * @since 1.70
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */
@@ -49,7 +49,7 @@ sap.ui.define([
 		 * @returns {object} Contains the information about the control
 		 * @private
 		 */
-		getControlIfTemplateAffected: function (oChange, oControl, mPropertyBag) {
+		getControlIfTemplateAffected: function(oChange, oControl, mPropertyBag) {
 			var oModifier = mPropertyBag.modifier;
 			var mControl = {
 				originalControl: oControl

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Applier.js

@@ -40,28 +40,28 @@ sap.ui.define([
 		 * @param {function} mStrategy.processTexts - Text postprocessing strategy
 		 * @returns {Promise<object>} - Processed manifest with descriptor changes
 		 */
-		applyChanges: function (oUpdatedManifest, aAppDescriptorChanges, mStrategy) {
+		applyChanges: function(oUpdatedManifest, aAppDescriptorChanges, mStrategy) {
 			return mStrategy.registry()
-				.then(function (Registry) {
-					var aChangeHandlerPromises = aAppDescriptorChanges.map(function (oChange) {
-						return Registry[oChange.getChangeType()] && Registry[oChange.getChangeType()]();
-					});
-					return Promise.all(aChangeHandlerPromises);
-				})
-				.then(function (aChangeHandlers) {
-					aChangeHandlers.forEach(function (oChangeHandler, iIndex) {
-						try {
-							var oChange = aAppDescriptorChanges[iIndex];
-							oUpdatedManifest = oChangeHandler.applyChange(oUpdatedManifest, oChange);
-							if (!oChangeHandler.skipPostprocessing && !isEmptyObject(oChange.getTexts())) {
-								oUpdatedManifest = mStrategy.processTexts(oUpdatedManifest, oChange.getTexts());
-							}
-						} catch (oError) {
-							mStrategy.handleError(oError);
+			.then(function(Registry) {
+				var aChangeHandlerPromises = aAppDescriptorChanges.map(function(oChange) {
+					return Registry[oChange.getChangeType()] && Registry[oChange.getChangeType()]();
+				});
+				return Promise.all(aChangeHandlerPromises);
+			})
+			.then(function(aChangeHandlers) {
+				aChangeHandlers.forEach(function(oChangeHandler, iIndex) {
+					try {
+						var oChange = aAppDescriptorChanges[iIndex];
+						oUpdatedManifest = oChangeHandler.applyChange(oUpdatedManifest, oChange);
+						if (!oChangeHandler.skipPostprocessing && !isEmptyObject(oChange.getTexts())) {
+							oUpdatedManifest = mStrategy.processTexts(oUpdatedManifest, oChange.getTexts());
 						}
-					});
-					return oUpdatedManifest;
+					} catch (oError) {
+						mStrategy.handleError(oError);
+					}
 				});
+				return oUpdatedManifest;
+			});
 		},
 
 		/**

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ApplyStrategyFactory.js

@@ -8,7 +8,7 @@
 sap.ui.define([
 	"sap/ui/fl/requireAsync",
 	"sap/base/Log"
-], function (
+], function(
 	requireAsync,
 	Log
 ) {
@@ -18,11 +18,11 @@ sap.ui.define([
 		registry: function() {
 			return requireAsync("sap/ui/fl/apply/_internal/changes/descriptor/Registration");
 		},
-		handleError: function (oError) {
+		handleError: function(oError) {
 			Log.error(oError);
 		},
-		processTexts: function (oManifest, oChangeTexts) {
-			//TODO: optimize performance by creating map not using JSON.stringify/parse
+		processTexts: function(oManifest, oChangeTexts) {
+			// TODO: optimize performance by creating map not using JSON.stringify/parse
 			var sManifest = JSON.stringify(oManifest);
 			Object.keys(oChangeTexts).forEach(function(sTextKey) {
 				if (oChangeTexts[sTextKey].value[""]) {
@@ -35,7 +35,6 @@ sap.ui.define([
 		}
 	};
 
-
 	var ApplyStrategyFactory = {
 		/**
 		 * Strategy to apply descriptor changes during runtime.

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ApplyUtil.js

@@ -12,7 +12,6 @@ sap.ui.define([
 ) {
 	"use strict";
 
-
 	var ApplyUtil = {
 
 		/**
@@ -24,7 +23,7 @@ sap.ui.define([
 		 * @private
 		 * @ui5-restricted sap.ui.fl.apply._internal
 		 */
-		formatBundleName: function (sId, sBundleUrl) {
+		formatBundleName: function(sId, sBundleUrl) {
 			if (sBundleUrl.startsWith("/")) {
 				throw Error("Absolute paths are not supported");
 			}

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @since 1.74
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @since 1.74
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @since 1.77
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */