@openui5/sap.ui.rta 1.115.0 → 1.116.0

package/src/sap/ui/rta/util/PopupManager.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PopupManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @constructor
 	 * @private
 	 * @since 1.48
@@ -100,17 +100,17 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._overrideInstanceFunctions = function() {
-		//check open popups and create overlays while starting RTA
+		// check open popups and create overlays while starting RTA
 		this._applyPopupAttributes({
 			method: this._createPopupOverlays,
 			setModal: true,
 			bringToTop: true
 		});
 
-		//override InstanceManager.AddDialogInstance() and InstanceManager.AddPopoverInstance()
+		// override InstanceManager.AddDialogInstance() and InstanceManager.AddPopoverInstance()
 		this._overrideAddPopupInstance();
 
-		//override InstanceManager.RemoveDialogInstance()  and InstanceManager.RemovePopoverInstance()
+		// override InstanceManager.RemoveDialogInstance()  and InstanceManager.RemovePopoverInstance()
 		this._overrideRemovePopupInstance();
 	};
 
@@ -176,7 +176,7 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._isComponentInsidePopup = function(oPopup) {
-		//check if root RTA component is directly inside a popupElement
+		// check if root RTA component is directly inside a popupElement
 		return Array.isArray(oPopup.getContent())
 			? oPopup.getContent().some(
 				function(oContent) {
@@ -209,7 +209,7 @@ sap.ui.define([
 			this.setProperty("rta", oRta);
 			var oRootControl = oRta.getRootControlInstance();
 			this.oRtaRootAppComponent = this._getAppComponentForControl(oRootControl);
-			//listener for RTA mode change
+			// listener for RTA mode change
 			var fnModeChange = this._onModeChange.bind(this);
 			oRta.attachModeChanged(fnModeChange);
 			this._overrideInstanceFunctions();
@@ -237,7 +237,7 @@ sap.ui.define([
 	PopupManager.prototype._onModeChange = function(oEvent) {
 		var sNewMode = oEvent.getParameters().mode;
 		var fnApplyFocusAndSetModal = function(sMode, oPopover) {
-			if (sMode === 'navigation') {
+			if (sMode === "navigation") {
 				// add focus handlers
 				oPopover.oPopup[this._getFocusEventName("add")]();
 			} else {
@@ -250,7 +250,7 @@ sap.ui.define([
 			}
 		};
 
-		sNewMode === 'navigation'
+		sNewMode === "navigation"
 			? this._applyPatchesToOpenPopups(_curry(fnApplyFocusAndSetModal)(sNewMode))
 			: this._removePatchesToOpenPopups(_curry(fnApplyFocusAndSetModal)(sNewMode));
 	};
@@ -297,11 +297,11 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._overrideAddPopupInstance = function() {
-		//Dialog
+		// Dialog
 		this._fnOriginalAddDialogInstance = InstanceManager.addDialogInstance;
 		InstanceManager.addDialogInstance = this._overrideAddFunctions(this._fnOriginalAddDialogInstance);
 
-		//Popover
+		// Popover
 		this._fnOriginalAddPopoverInstance = InstanceManager.addPopoverInstance;
 		InstanceManager.addPopoverInstance = this._overrideAddFunctions(this._fnOriginalAddPopoverInstance);
 	};
@@ -320,7 +320,7 @@ sap.ui.define([
 				if (this._isPopupAdaptable(oPopupElement)
 					&& this.getRta()._oDesignTime) {
 					oPopupElement.attachEventOnce("afterOpen", this._createPopupOverlays, this);
-					//PopupManager internal method
+					// PopupManager internal method
 					oPopupElement.attachEventOnce("afterOpen", this.fireOpen, this);
 					this._setModal(true, oPopupElement);
 				} else if (!(oPopupElement instanceof Popover)) {
@@ -342,7 +342,7 @@ sap.ui.define([
 	 */
 	PopupManager.prototype._setModal = function(bSetModal, oPopupElement) {
 		var bOriginalModalState = this._oModalState.get(oPopupElement.oPopup);
-		if (typeof bOriginalModalState !== "boolean" && bSetModal && this.getRta().getMode() !== 'navigation') {
+		if (typeof bOriginalModalState !== "boolean" && bSetModal && this.getRta().getMode() !== "navigation") {
 			this._oModalState.set(oPopupElement.oPopup, oPopupElement.oPopup.getModal());
 			if (this._isPopupAdaptable(oPopupElement)) {
 				this._adjustRootOverlayVisibility(false, oPopupElement);
@@ -358,12 +358,12 @@ sap.ui.define([
 	};
 
 	PopupManager.prototype._applyPopupAttributes = function(mPropertyBag) {
-		//check if popups are open
+		// check if popups are open
 		var oRelevantPopups = this.getCategorizedOpenPopups();
 
 		["aDialogs", "aPopovers"].forEach(function(sKey) {
 			if (oRelevantPopups[sKey].length > 0) {
-				//set focus
+				// set focus
 				if (mPropertyBag.focus) {
 					if (oRelevantPopups[sKey][0].oPopup.oContent) {
 						oRelevantPopups[sKey][0].oPopup.oContent.focus();
@@ -371,13 +371,13 @@ sap.ui.define([
 				}
 
 				oRelevantPopups[sKey].forEach(function(oPopupElement) {
-					//call passed method for all relevant popups
+					// call passed method for all relevant popups
 					mPropertyBag.method.call(this, oPopupElement);
 				}.bind(this));
 			}
 		}.bind(this));
 
-		//set modal for all popups
+		// set modal for all popups
 		oRelevantPopups.aAllSupportedPopups.forEach(this._setModal.bind(this, mPropertyBag.setModal));
 	};
 
@@ -409,10 +409,10 @@ sap.ui.define([
 				aAutoCloseAreas.push(oRtaToolbar.getDomRef());
 			}
 		}
-		//If clicked from toolbar or popup - autoClose is disabled
+		// If clicked from toolbar or popup - autoClose is disabled
 		oPopup.setExtraContent(aAutoCloseAreas);
 
-		//cases when onAfterRendering is called after this function - app inside popup
+		// cases when onAfterRendering is called after this function - app inside popup
 		if (!this.fnOriginalPopupOnAfterRendering) {
 			this.fnOriginalPopupOnAfterRendering = oPopup.onAfterRendering;
 		}
@@ -422,8 +422,8 @@ sap.ui.define([
 			return vOriginalReturn;
 		}.bind(this);
 
-		//only remove focus event when in adaptation mode
-		if (this.getRta().getMode() === 'adaptation') {
+		// only remove focus event when in adaptation mode
+		if (this.getRta().getMode() === "adaptation") {
 			oPopup[this._getFocusEventName("remove")]();
 		}
 	};
@@ -434,11 +434,11 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._overrideRemovePopupInstance = function() {
-		//Dialog
+		// Dialog
 		this._fnOriginalRemoveDialogInstance = InstanceManager.removeDialogInstance;
 		InstanceManager.removeDialogInstance = this._overrideRemoveFunctions(this._fnOriginalRemoveDialogInstance);
 
-		//Popover
+		// Popover
 		this._fnOriginalRemovePopoverInstance = InstanceManager.removePopoverInstance;
 		InstanceManager.removePopoverInstance = this._overrideRemoveFunctions(this._fnOriginalRemovePopoverInstance);
 	};
@@ -460,7 +460,7 @@ sap.ui.define([
 				}
 				// remove the Modal state from the map
 				this._oModalState.delete(oPopupElement.oPopup);
-				//PopupManager internal method
+				// PopupManager internal method
 				this.fireClose(oPopupElement);
 			}
 			return vOriginalReturn;
@@ -533,7 +533,7 @@ sap.ui.define([
 		}
 		var oPopupElement = (oEvent instanceof Element) ? oEvent : oEvent.getSource();
 
-		//when application is opened in a popup, rootElement should not be added more than once
+		// when application is opened in a popup, rootElement should not be added more than once
 		if (
 			this.getRta()._oDesignTime.getRootElements().indexOf(oPopupElement.getId()) === -1
 			&& !this._isComponentInsidePopup(oPopupElement)
@@ -541,7 +541,7 @@ sap.ui.define([
 			this.getRta()._oDesignTime.addRootElement(oPopupElement);
 		}
 
-		//detach for persistent popups with same id
+		// detach for persistent popups with same id
 		oPopupElement.detachAfterOpen(this._createPopupOverlays, this);
 
 		this._applyPopupPatch(oPopupElement);
@@ -553,7 +553,7 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._restoreInstanceFunctions = function() {
-		//Dialog
+		// Dialog
 		if (this._fnOriginalAddDialogInstance) {
 			InstanceManager.addDialogInstance = this._fnOriginalAddDialogInstance;
 		}
@@ -561,7 +561,7 @@ sap.ui.define([
 			InstanceManager.removeDialogInstance = this._fnOriginalRemoveDialogInstance;
 		}
 
-		//Popover
+		// Popover
 		if (this._fnOriginalAddPopoverInstance) {
 			InstanceManager.addPopoverInstance = this._fnOriginalAddPopoverInstance;
 		}

package/src/sap/ui/rta/util/ReloadManager.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @namespace sap.ui.rta.util.ReloadManager
 	 * @alias sap.ui.rta.util.ReloadManager
 	 * @since 1.104
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/util/ServiceEventBus.js

@@ -19,19 +19,18 @@ function(
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus
 	 */
 	var ServiceEventBus = EventBus.extend("sap.ui.rta.util.ServiceEventBus");
 
-
-	ServiceEventBus.prototype._callListener = function (fnCallback, oListener, sChannelId, sEventId, vData) {
+	ServiceEventBus.prototype._callListener = function(fnCallback, oListener, sChannelId, sEventId, vData) {
 		fnCallback.call(oListener, vData);
 	};
 
-	ServiceEventBus.prototype.getChannel = function (sChannelId) {
+	ServiceEventBus.prototype.getChannel = function(sChannelId) {
 		return this._mChannels[sChannelId];
 	};
 

package/src/sap/ui/rta/util/StylesLoader.js

@@ -16,15 +16,15 @@ sap.ui.define([
 	 * @param {string} sFileName - Name of the file
 	 * @return {jqXHR} - returns jqXHR object which can be thenable
 	 */
-	module.loadStyles = function (sFileName) {
-		return jQuery.get(sap.ui.require.toUrl(('sap.ui.rta.assets.' + sFileName).replace(/\./g, "/")) + '.css')
-				.then(function (sData) {
-					// TODO: check if it's possible to use UI5 standard mechanism for styles adjustments
-					if (Configuration.getRTL()) {
-						return sData.replace(/right/g, 'left');
-					}
-					return sData;
-				});
+	module.loadStyles = function(sFileName) {
+		return jQuery.get(sap.ui.require.toUrl(("sap.ui.rta.assets." + sFileName).replace(/\./g, "/")) + ".css")
+		.then(function(sData) {
+			// TODO: check if it's possible to use UI5 standard mechanism for styles adjustments
+			if (Configuration.getRTL()) {
+				return sData.replace(/right/g, "left");
+			}
+			return sData;
+		});
 	};
 
 	return module;

package/src/sap/ui/rta/util/UrlParser.js

@@ -14,7 +14,7 @@ sap.ui.define([], function() {
 	 * @param {string} sParamName - Parameter name
 	 * @return {string|undefined} - Returns value of the specified param or undefined if not found
 	 */
-	module.getParam = function (sParamName) {
+	module.getParam = function(sParamName) {
 		return module.getParams()[sParamName];
 	};
 
@@ -23,28 +23,28 @@ sap.ui.define([], function() {
 	 * @param {string} [sUrl] - Url parameter string notation starting with ? and following key value pair
 	 * @returns {object} Object with key value pairs of given parameters
 	 */
-	module.getParams = function (sUrl) {
+	module.getParams = function(sUrl) {
 		sUrl = (sUrl || sUrl === "") ? sUrl : document.location.search;
 		return sUrl
-			.replace(/^\?/, "")
-			.split("&")
-			.reduce(function (mParams, sParam) {
-				var aParts = sParam.split("="); //split on key/value
-				var sValue = aParts[1];
+		.replace(/^\?/, "")
+		.split("&")
+		.reduce(function(mParams, sParam) {
+			var aParts = sParam.split("="); // split on key/value
+			var sValue = aParts[1];
 
-				switch (sValue) {
-					case "true":
-						sValue = true;
-						break;
-					case "false":
-						sValue = false;
-						break;
-					default: break;
-				}
+			switch (sValue) {
+				case "true":
+					sValue = true;
+					break;
+				case "false":
+					sValue = false;
+					break;
+				default: break;
+			}
 
-				mParams[aParts[0]] = sValue;
-				return mParams;
-			}, {});
+			mParams[aParts[0]] = sValue;
+			return mParams;
+		}, {});
 	};
 
 	return module;

package/src/sap/ui/rta/util/adaptationStarter.js

@@ -33,14 +33,14 @@ sap.ui.define([
 	function checkKeyUser(sLayer) {
 		if (Layer.CUSTOMER === sLayer) {
 			return FeaturesAPI.isKeyUser()
-				.then(function(bIsKeyUser) {
-					if (!bIsKeyUser) {
-						var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
-						var oError = new Error(oRtaResourceBundle.getText("MSG_NO_KEY_USER_RIGHTS_ERROR_MESSAGE"));
-						oError.reason = "isKeyUser";
-						throw oError;
-					}
-				});
+			.then(function(bIsKeyUser) {
+				if (!bIsKeyUser) {
+					var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
+					var oError = new Error(oRtaResourceBundle.getText("MSG_NO_KEY_USER_RIGHTS_ERROR_MESSAGE"));
+					oError.reason = "isKeyUser";
+					throw oError;
+				}
+			});
 		}
 		return Promise.resolve();
 	}
@@ -123,36 +123,39 @@ sap.ui.define([
 				};
 
 				PersistenceWriteAPI.getChangesWarning(mPropertyBag)
-					.then(function(oWarningMessage) {
-						if (oWarningMessage.showWarning) {
-							var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
-							var oMessageProps = oWarningMessage.warningType === "mixedChangesWarning"
-								? {
-									text: "MSG_ADAPTATION_STARTER_MIXED_CHANGES_WARNING",
-									title: "TIT_ADAPTATION_STARTER_MIXED_CHANGES_TITLE"
-								}
-								: {
-									text: "MSG_ADAPTATION_STARTER_NO_CHANGES_IN_P_WARNING",
-									title: "TIT_ADAPTATION_STARTER_NO_CHANGES_IN_P_TITLE"
-								};
+				.then(function(oWarningMessage) {
+					if (oWarningMessage.showWarning) {
+						var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
+						var oMessageProps = oWarningMessage.warningType === "mixedChangesWarning"
+							? {
+								text: "MSG_ADAPTATION_STARTER_MIXED_CHANGES_WARNING",
+								title: "TIT_ADAPTATION_STARTER_MIXED_CHANGES_TITLE"
+							}
+							: {
+								text: "MSG_ADAPTATION_STARTER_NO_CHANGES_IN_P_WARNING",
+								title: "TIT_ADAPTATION_STARTER_NO_CHANGES_IN_P_TITLE"
+							};
 
-							showMessageBox(
-								oRtaResourceBundle.getText(oMessageProps.text),
-								{
-									title: oRtaResourceBundle.getText(oMessageProps.title)
-								},
-								"warning"
-							);
-						}
-					});
+						showMessageBox(
+							oRtaResourceBundle.getText(oMessageProps.text),
+							{
+								title: oRtaResourceBundle.getText(oMessageProps.title)
+							},
+							"warning"
+						);
+					}
+				});
 			}
 			return oRta;
 		})
 		.catch(function(vError) {
-			if (vError !== "Reload triggered") {
+			if (
+				vError !== "Reload triggered"
+				&& !(FlexUtils.getUshellContainer() && vError.reason === "flexEnabled") // FLP Plugin already handles this error
+			) {
 				var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
 				showMessageBox(
-					oRtaResourceBundle.getText("MSG_GENERIC_ERROR_MESSAGE", vError.message),
+					oRtaResourceBundle.getText("MSG_GENERIC_ERROR_MESSAGE", [vError.message]),
 					{title: oRtaResourceBundle.getText("MSG_ADAPTATION_COULD_NOT_START")},
 					"error"
 				);

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicator.js

@@ -5,29 +5,31 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Fragment",
-	"sap/ui/model/json/JSONModel",
-	"sap/ui/core/Control",
 	"sap/ui/core/format/DateFormat",
+	"sap/ui/core/Control",
+	"sap/ui/core/Core",
+	"sap/ui/core/Fragment",
+	"sap/ui/core/StaticArea",
 	"sap/ui/events/KeyCodes",
-	"sap/ui/rta/util/changeVisualization/commands/getCommandVisualization",
-	"sap/ui/fl/Utils",
 	"sap/ui/fl/util/resolveBinding",
-	"sap/ui/rta/util/changeVisualization/ChangeVisualizationUtils",
-	"sap/ui/core/Core",
-	"sap/ui/rta/util/changeVisualization/ChangeCategories"
+	"sap/ui/fl/Utils",
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/rta/util/changeVisualization/commands/getCommandVisualization",
+	"sap/ui/rta/util/changeVisualization/ChangeCategories",
+	"sap/ui/rta/util/changeVisualization/ChangeVisualizationUtils"
 ], function(
-	Fragment,
-	JSONModel,
-	Control,
 	DateFormat,
+	Control,
+	Core,
+	Fragment,
+	StaticArea,
 	KeyCodes,
-	getCommandVisualization,
-	FlUtils,
 	resolveBinding,
-	ChangeVisualizationUtils,
-	Core,
-	ChangeCategories
+	FlUtils,
+	JSONModel,
+	getCommandVisualization,
+	ChangeCategories,
+	ChangeVisualizationUtils
 ) {
 	"use strict";
 
@@ -40,7 +42,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicator
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @private
 	 */
 	var ChangeIndicator = Control.extend("sap.ui.rta.util.changeVisualization.ChangeIndicator", {
@@ -308,7 +310,7 @@ sap.ui.define([
 		if (oDomRef) {
 			oDomRef.parentNode.removeChild(oDomRef);
 		}
-		this.placeAt(Core.getStaticAreaRef());
+		this.placeAt(StaticArea.getDomRef());
 
 		this.setProperty("overlayId", sOverlayId);
 		return this;
@@ -397,7 +399,7 @@ sap.ui.define([
 
 	ChangeIndicator.prototype._toggleDetailPopover = function() {
 		if (!this.getAggregation("_popover")) {
-			//store the tabindex (tabindex will be removed on opening the popover)
+			// store the tabindex (tabindex will be removed on opening the popover)
 			this._iOldTabIndex = this.getDomRef().getAttribute("tabindex");
 			Fragment.load({
 				name: "sap.ui.rta.util.changeVisualization.ChangeIndicatorPopover",