@openui5/sap.ui.rta 1.99.1 → 1.102.0

package/src/sap/ui/rta/plugin/Combine.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.46
@@ -44,21 +44,15 @@ sap.ui.define([
 	/**
 	 * Check if the given overlay is editable.
 	 * @param {sap.ui.dt.ElementOverlay} oOverlay - Overlay to be checked for editable
-	 * @returns {Promise.<boolean>|boolean} <code>true</code> when editable wrapped in a promise.
+	 * @returns {Promise.<boolean>} <code>true</code> when editable wrapped in a promise.
 	 * @private
 	 */
 	Combine.prototype._isEditable = function (oOverlay) {
 		var oCombineAction = this.getAction(oOverlay);
-		if (!oOverlay.isRoot() && oCombineAction && oCombineAction.changeType && oCombineAction.changeOnRelevantContainer) {
-			var oRelevantContainer = oOverlay.getRelevantContainer();
-			return this.hasChangeHandler(oCombineAction.changeType, oRelevantContainer)
-				.then(function(bHasChangeHandler) {
-					return bHasChangeHandler &&
-						this.hasStableId(oOverlay) &&
-						this._checkRelevantContainerStableID(oCombineAction, oOverlay);
-				}.bind(this));
+		if (!oOverlay.isRoot() && oCombineAction && oCombineAction.changeOnRelevantContainer) {
+			return this._checkChangeHandlerAndStableId(oOverlay);
 		}
-		return false;
+		return Promise.resolve(false);
 	};
 
 	Combine.prototype._checkForSameRelevantContainer = function(aElementOverlays) {
@@ -159,7 +153,7 @@ sap.ui.define([
 	/**
 	 * @param {sap.ui.dt.ElementOverlay[]} aElementOverlays - specified overlays
 	 * @param {sap.ui.core.Element} oCombineElement - element where the combine was triggered
-	 * @returns {promise} Promise
+	 * @returns {Promise} Promise
 	 */
 	Combine.prototype.handleCombine = function(aElementOverlays, oCombineElement) {
 		var oCombineElementOverlay;

package/src/sap/ui/rta/plugin/CompVariant.js

@@ -36,13 +36,9 @@ sap.ui.define([
 		}
 	});
 
-	function isVariantManagementControl(oOverlay) {
-		return oOverlay.getElement().getMetadata().getName() === "sap.ui.comp.smartvariants.SmartVariantManagement";
-	}
-
-	function createCommandAndFireEvent(oOverlay, sName, mProperties) {
+	function createCommandAndFireEvent(oOverlay, sName, mProperties, oElement) {
 		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
-		var oTargetElement = oOverlay.getElement();
+		var oTargetElement = oElement || oOverlay.getElement();
 
 		return this.getCommandFactory().getCommandFor(oTargetElement, sName, mProperties, oDesignTimeMetadata)
 
@@ -167,83 +163,106 @@ sap.ui.define([
 		}.bind(this), oContextSharingComponentContainer);
 	}
 
+	// ------ change content ------
+	function changeContent(aOverlays) {
+		var oControl = aOverlays[0].getElementInstance();
+		var oAction = this.getAction(aOverlays[0]);
+		oAction.handler(oControl, {styleClass: Utils.getRtaStyleClassName()}).then(function(aData) {
+			createCommandAndFireEvent.call(this, aOverlays[0], "compVariantContent", {
+				variantId: aData[0].changeSpecificData.content.key,
+				newContent: aData[0].changeSpecificData.content.content,
+				persistencyKey: aData[0].changeSpecificData.content.persistencyKey
+			}, oControl.getVariantManagement());
+		}.bind(this));
+	}
+
 	CompVariant.prototype._isEditable = function(oOverlay) {
-		return isVariantManagementControl(oOverlay) && this.hasStableId(oOverlay);
+		return this.hasStableId(oOverlay) && !!this.getAction(oOverlay);
 	};
 
 	CompVariant.prototype.getMenuItems = function(aElementOverlays) {
 		var oElementOverlay = aElementOverlays[0];
 		var oVariantManagementControl = oElementOverlay.getElement();
 		var aMenuItems = [];
+		if (this.isAvailable([oElementOverlay])) {
+			if (this.getAction(oElementOverlay).changeType === "variantContent") {
+				aMenuItems.push({
+					id: "CTX_COMP_VARIANT_CONTENT",
+					text: this.getActionText(oElementOverlay, this.getAction(oElementOverlay)),
+					handler: changeContent.bind(this),
+					enabled: true,
+					rank: 250,
+					icon: "sap-icon://key-user-settings"
+				});
+			} else {
+				var sLayer = this.getCommandFactory().getFlexSettings().layer;
+				var oLibraryBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
+				var aVariants = getAllVariants(oElementOverlay);
+				var oCurrentVariant = aVariants.find(function(oVariant) {
+					return oVariant.getId() === oVariantManagementControl.getPresentVariantId();
+				});
 
-		if (this._isEditable(oElementOverlay)) {
-			var sLayer = this.getCommandFactory().getFlexSettings().layer;
-			var oLibraryBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
-			var aVariants = getAllVariants(oElementOverlay);
-			var oCurrentVariant = aVariants.find(function(oVariant) {
-				return oVariant.getId() === oVariantManagementControl.getPresentVariantId();
-			});
+				if (oCurrentVariant.isRenameEnabled(sLayer)) {
+					aMenuItems.push({
+						id: "CTX_COMP_VARIANT_RENAME",
+						text: oLibraryBundle.getText("CTX_RENAME"),
+						handler: renameVariant.bind(this),
+						enabled: true,
+						rank: 210,
+						icon: "sap-icon://edit"
+					});
+				}
+
+				if (oCurrentVariant.isEditEnabled(sLayer)) {
+					aMenuItems.push({
+						id: "CTX_COMP_VARIANT_SAVE",
+						text: oLibraryBundle.getText("CTX_VARIANT_SAVE"),
+						handler: saveVariant.bind(this),
+						enabled: isSaveEnabled,
+						rank: 220,
+						icon: "sap-icon://save"
+					});
+				}
 
-			if (oCurrentVariant.isRenameEnabled(sLayer)) {
 				aMenuItems.push({
-					id: "CTX_COMP_VARIANT_RENAME",
-					text: oLibraryBundle.getText("CTX_RENAME"),
-					handler: renameVariant.bind(this),
+					id: "CTX_COMP_VARIANT_SAVE_AS",
+					text: oLibraryBundle.getText("CTX_VARIANT_SAVEAS"),
+					handler: saveAsNewVariant.bind(this),
 					enabled: true,
-					rank: 210,
-					icon: "sap-icon://edit"
+					rank: 230,
+					icon: "sap-icon://duplicate"
 				});
-			}
 
-			if (oCurrentVariant.isEditEnabled(sLayer)) {
 				aMenuItems.push({
-					id: "CTX_COMP_VARIANT_SAVE",
-					text: oLibraryBundle.getText("CTX_VARIANT_SAVE"),
-					handler: saveVariant.bind(this),
-					enabled: isSaveEnabled,
-					rank: 220,
-					icon: "sap-icon://save"
+					id: "CTX_COMP_VARIANT_MANAGE",
+					text: oLibraryBundle.getText("CTX_VARIANT_MANAGE"),
+					handler: configureVariants.bind(this),
+					enabled: true,
+					rank: 240,
+					icon: "sap-icon://action-settings"
 				});
-			}
-
-			aMenuItems.push({
-				id: "CTX_COMP_VARIANT_SAVE_AS",
-				text: oLibraryBundle.getText("CTX_VARIANT_SAVEAS"),
-				handler: saveAsNewVariant.bind(this),
-				enabled: true,
-				rank: 230,
-				icon: "sap-icon://duplicate"
-			});
-
-			aMenuItems.push({
-				id: "CTX_COMP_VARIANT_MANAGE",
-				text: oLibraryBundle.getText("CTX_VARIANT_MANAGE"),
-				handler: configureVariants.bind(this),
-				enabled: true,
-				rank: 240,
-				icon: "sap-icon://action-settings"
-			});
 
-			var aSubmenuItems = aVariants.map(function(oVariant) {
-				var bCurrentItem = oVariantManagementControl.getPresentVariantId() === oVariant.getId();
-				var oItem = {
-					id: oVariant.getId(),
-					text: oVariant.getText("variantName"),
-					icon: bCurrentItem ? "sap-icon://accept" : "blank",
-					enabled: !bCurrentItem
-				};
-				return oItem;
-			});
+				var aSubmenuItems = aVariants.map(function(oVariant) {
+					var bCurrentItem = oVariantManagementControl.getPresentVariantId() === oVariant.getId();
+					var oItem = {
+						id: oVariant.getId(),
+						text: oVariant.getText("variantName"),
+						icon: bCurrentItem ? "sap-icon://accept" : "blank",
+						enabled: !bCurrentItem
+					};
+					return oItem;
+				});
 
-			aMenuItems.push({
-				id: "CTX_COMP_VARIANT_SWITCH",
-				text: oLibraryBundle.getText("CTX_VARIANT_SWITCH"),
-				handler: switchVariant.bind(this),
-				enabled: isSwitchEnabled,
-				submenu: aSubmenuItems,
-				rank: 250,
-				icon: "sap-icon://switch-views"
-			});
+				aMenuItems.push({
+					id: "CTX_COMP_VARIANT_SWITCH",
+					text: oLibraryBundle.getText("CTX_VARIANT_SWITCH"),
+					handler: switchVariant.bind(this),
+					enabled: isSwitchEnabled,
+					submenu: aSubmenuItems,
+					rank: 250,
+					icon: "sap-icon://switch-views"
+				});
+			}
 		}
 
 		return aMenuItems;

package/src/sap/ui/rta/plugin/ControlVariant.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @class The ControlVariant allows propagation of variantManagement key
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.50

package/src/sap/ui/rta/plugin/CreateContainer.js

@@ -7,13 +7,11 @@
 sap.ui.define([
 	"sap/ui/rta/plugin/BaseCreate",
 	"sap/ui/fl/Utils",
-	"sap/ui/rta/Utils",
 	"sap/ui/dt/Util",
 	"sap/base/util/uid"
 ], function(
 	BaseCreate,
 	FlexUtils,
-	RtaUtils,
 	DtUtil,
 	uid
 ) {
@@ -27,7 +25,7 @@ sap.ui.define([
 	 * @class The CreateContainer allows trigger CreateContainer operations on the overlay
 	 * @extends sap.ui.rta.plugin.BaseCreate
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/plugin/CutPaste.js

@@ -31,7 +31,7 @@ function(
 	 * @extends sap.ui.dt.plugin.CutPaste
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/DragDrop.js

@@ -33,7 +33,7 @@ function(
 	 * @extends sap.ui.dt.plugin.ControlDragDrop
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/EasyAdd.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class The EasyAdd Plugin adds an Icon to an Overlay, which allows to trigger add operations directly
 	 * @extends sap.ui.rta.plugin.additionalElements.AdditionalElementsPlugin
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.48

package/src/sap/ui/rta/plugin/EasyRemove.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class The EasyRemove Plugin adds an Icon to an Overlay, which allows to trigger remove operations directly
 	 * @extends sap.ui.rta.plugin.Remove
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.48

package/src/sap/ui/rta/plugin/LocalReset.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.90

package/src/sap/ui/rta/plugin/Plugin.js

@@ -69,7 +69,7 @@ function(
 	 * @extends sap.ui.dt.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @private
@@ -168,16 +168,20 @@ function(
 	BasePlugin.prototype._getRelevantOverlays = function(oOverlay, sAggregationName) {
 		var aAlreadyDefinedRelevantOverlays = oOverlay.getRelevantOverlays();
 		if (aAlreadyDefinedRelevantOverlays.length === 0) {
-			var aRelevantOverlays = OverlayUtil.findAllOverlaysInContainer(oOverlay);
-
-			// if an aggregation name is given, those overlays are added without checking the relevant container
-			if (sAggregationName) {
-				var oAggregationOverlay = oOverlay.getAggregationOverlay(sAggregationName);
-				var aAggregationChildren = oAggregationOverlay ? oAggregationOverlay.getChildren() : [];
-				aAggregationChildren = aAggregationChildren.filter(function(oChildOverlay) {
-					return aRelevantOverlays.indexOf(oChildOverlay) === -1;
-				});
-				aRelevantOverlays = aRelevantOverlays.concat(aAggregationChildren);
+			var aRelevantOverlays = [];
+			// Overlays in aggregation binding templates are not relevant
+			if (!oOverlay.getIsPartOfTemplate()) {
+				aRelevantOverlays = OverlayUtil.findAllOverlaysInContainer(oOverlay);
+
+				// if an aggregation name is given, those overlays are added without checking the relevant container
+				if (sAggregationName) {
+					var oAggregationOverlay = oOverlay.getAggregationOverlay(sAggregationName);
+					var aAggregationChildren = oAggregationOverlay ? oAggregationOverlay.getChildren() : [];
+					aAggregationChildren = aAggregationChildren.filter(function(oChildOverlay) {
+						return aRelevantOverlays.indexOf(oChildOverlay) === -1;
+					});
+					aRelevantOverlays = aRelevantOverlays.concat(aAggregationChildren);
+				}
 			}
 
 			oOverlay.setRelevantOverlays(aRelevantOverlays);
@@ -370,5 +374,22 @@ function(
 		return true;
 	};
 
+	BasePlugin.prototype._checkChangeHandlerAndStableId = function(oElementOverlay) {
+		var oAction = this.getAction(oElementOverlay);
+		if (oAction && oAction.changeType) {
+			var oElement = oAction.changeOnRelevantContainer ?
+				oElementOverlay.getRelevantContainer() :
+				oElementOverlay.getElement();
+
+			return this.hasChangeHandler(oAction.changeType, oElement)
+				.then(function(bHasChangeHandler) {
+					return bHasChangeHandler
+						&& this._checkRelevantContainerStableID(oAction, oElementOverlay)
+						&& this.hasStableId(oElementOverlay);
+				}.bind(this));
+		}
+		return Promise.resolve(false);
+	};
+
 	return BasePlugin;
 });

package/src/sap/ui/rta/plugin/RTAElementMover.js

@@ -35,7 +35,7 @@ function(
 	 * The RTAElementMover is responsible for the RTA specific adaptation of element movements.
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/Remove.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class The Remove allows trigger remove operations on the overlay
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -59,26 +59,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * @param {sap.ui.dt.ElementOverlay} oElementOverlay - Overlay to be checked for editable
-	 * @return {Promise.<boolean>|boolean} <code>true</code> if it's editable wrapped in a promise.
+	 * @param {sap.ui.dt.ElementOverlay} oOverlay - Overlay to be checked for editable
+	 * @return {Promise.<boolean>} <code>true</code> if it's editable wrapped in a promise.
 	 * @private
 	 */
-	Remove.prototype._isEditable = function (oElementOverlay) {
-		var oElement = oElementOverlay.getElement();
-
-		var oRemoveAction = this.getAction(oElementOverlay);
-		if (oRemoveAction && oRemoveAction.changeType) {
-			if (oRemoveAction.changeOnRelevantContainer) {
-				oElement = oElementOverlay.getRelevantContainer();
-			}
-			return this.hasChangeHandler(oRemoveAction.changeType, oElement)
-				.then(function(bHasChangeHandler) {
-					return bHasChangeHandler
-						&& this._checkRelevantContainerStableID(oRemoveAction, oElementOverlay)
-						&& this.hasStableId(oElementOverlay);
-				}.bind(this));
-		}
-		return false;
+	Remove.prototype._isEditable = function (oOverlay) {
+		return this._checkChangeHandlerAndStableId(oOverlay);
 	};
 
 	/**
@@ -114,12 +100,25 @@ sap.ui.define([
 	/**
 	 * Checks if Overlay control has a valid parent and if it is
 	 * not the last visible control in the aggregation
+	 * The removal of the last element in the aggregation can
+	 * be defined by the parameter 'removeLastElement' in the
+	 * designtime of the aggregation
 	 *
 	 * @param  {sap.ui.dt.ElementOverlay[]} aElementOverlays - overlays to be removed
 	 * @return {boolean} Returns true if the control can be removed
 	 * @private
 	 */
 	Remove.prototype._canBeRemovedFromAggregation = function(aElementOverlays) {
+		//Check if designtime allows removing last visible element
+		var fnCheckDesignTimeSettings = function (oOverlay) {
+			var oParentOverlay = oOverlay.getParentAggregationOverlay();
+			if (oParentOverlay) {
+				var oAction = this.getAction(oParentOverlay);
+				return !!(oAction && oAction.removeLastElement);
+			}
+			return false;
+		}.bind(this);
+
 		var oOverlay = aElementOverlays[0];
 		var oElement = oOverlay.getElement();
 		var oParent = oElement.getParent();
@@ -130,17 +129,17 @@ sap.ui.define([
 		if (!Array.isArray(aElements)) {
 			return true;
 		}
-		if (aElements.length === 1) {
-			return false;
-		}
-
-		// Fallback to 1 if no overlay is selected
+		// check if selected Overlays are the last visible elements in aggregation
 		var iNumberOfSelectedOverlays = aElementOverlays.length;
 		var aInvisibleElements = aElements.filter(function(oElement) {
 			var oElementOverlay = OverlayRegistry.getOverlay(oElement);
 			return !(oElementOverlay && oElementOverlay.getElementVisibility());
 		});
-		return !(aInvisibleElements.length === (aElements.length - iNumberOfSelectedOverlays));
+		var bIsLastVisibleElement = (aInvisibleElements.length + iNumberOfSelectedOverlays === aElements.length);
+		if (bIsLastVisibleElement) {
+			return fnCheckDesignTimeSettings(oOverlay);
+		}
+		return true;
 	};
 
 	/**
@@ -323,4 +322,4 @@ sap.ui.define([
 	};
 
 	return Remove;
-});
+});

package/src/sap/ui/rta/plugin/Rename.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @private
@@ -76,12 +76,12 @@ sap.ui.define([
 	};
 
 	Rename.prototype.startEdit = function (oOverlay) {
-		var oElement = oOverlay.getElement();
-		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
-		var vDomRef = oDesignTimeMetadata.getAction("rename", oElement).domRef;
+		var vDomRef = this.getAction(oOverlay).domRef;
+		var fnGetTextMutators = this.getAction(oOverlay).getTextMutators;
 		RenameHandler.startEdit.call(this, {
 			overlay: oOverlay,
 			domRef: vDomRef,
+			getTextMutators: fnGetTextMutators,
 			pluginMethodName: "plugin.Rename.startEdit"
 		});
 	};
@@ -162,20 +162,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Rename.prototype._isEditable = function(oOverlay) {
-		var oElement = oOverlay.getElement();
-		var oRenameAction = this.getAction(oOverlay);
-		if (oRenameAction && oRenameAction.changeType) {
-			if (oRenameAction.changeOnRelevantContainer) {
-				oElement = oOverlay.getRelevantContainer();
-			}
-			return this.hasChangeHandler(oRenameAction.changeType, oElement)
-				.then(function(bHasChangeHandler) {
-					return bHasChangeHandler
-						&& this._checkRelevantContainerStableID(oRenameAction, oOverlay)
-						&& this.hasStableId(oOverlay);
-				}.bind(this));
-		}
-		return false;
+		return this._checkChangeHandlerAndStableId(oOverlay);
 	};
 
 	/**
@@ -194,7 +181,7 @@ sap.ui.define([
 	 */
 	Rename.prototype._emitLabelChangeEvent = function() {
 		var sText = RenameHandler._getCurrentEditableFieldText.call(this);
-		this._$oEditableControlDomRef.text(sText);
+		this._fnSetControlText(sText);
 
 		var oResponsibleElementOverlay = this.getResponsibleElementOverlay(this._oEditedOverlay);
 		var oRenamedElement = oResponsibleElementOverlay.getElement();

package/src/sap/ui/rta/plugin/RenameHandler.js

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * Provides Rename handling functionality
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @private
@@ -109,6 +109,18 @@ sap.ui.define([
 			}
 
 			this._$oEditableControlDomRef = jQuery(vEditableControlDomRef); /* Text Control */
+			var mMutators = typeof mPropertyBag.getTextMutators === "function"
+				? mPropertyBag.getTextMutators(oElement)
+				: {
+					getText: function () {
+						return this._$oEditableControlDomRef.text();
+					}.bind(this),
+					setText: function (sNewText) {
+						this._$oEditableControlDomRef.text(sNewText);
+					}.bind(this)
+				};
+			this._fnGetControlText = mMutators.getText;
+			this._fnSetControlText = mMutators.setText;
 			var iWidthDifference = 0;
 
 			// case where the editable control has it's own overlay
@@ -154,11 +166,12 @@ sap.ui.define([
 			this._$editableField = jQuery("<div contentEditable='true'></div>").appendTo(_$oWrapper);
 
 			// if label is empty, set a preliminary dummy text at the control to get an overlay
-			if (this._$oEditableControlDomRef.text() === "") {
-				this._$oEditableControlDomRef.text("_?_");
+			var sCurrentText = this._fnGetControlText();
+			if (sCurrentText === "") {
+				this._fnSetControlText("_?_");
 				this._$editableField.text("");
 			} else {
-				this._$editableField.text(this._$oEditableControlDomRef.text());
+				this._$editableField.text(sCurrentText);
 			}
 
 			this.setOldValue(RenameHandler._getCurrentEditableFieldText.call(this));
@@ -172,6 +185,8 @@ sap.ui.define([
 				"-webkit-user-modify": "read-write",
 				"-ms-user-modify": "read-write",
 				"user-modify": "read-write",
+				"user-select": "text",
+				"-webkit-user-select": "text",
 				"text-overflow": "clip",
 				"white-space": "nowrap"
 			});
@@ -284,8 +299,8 @@ sap.ui.define([
 			this.setBusy(false);
 
 			// exchange the dummy text at the label with the genuine empty text (see start_edit function)
-			if (this._$oEditableControlDomRef.text() === "_?_") {
-				this._$oEditableControlDomRef.text("");
+			if (this._fnGetControlText() === "_?_") {
+				this._fnSetControlText("");
 			}
 
 			this._oEditedOverlay.$().find(".sapUiRtaEditableField").remove();
@@ -305,6 +320,8 @@ sap.ui.define([
 			delete this._$oEditableControlDomRef;
 			delete this._oEditedOverlay;
 			delete this._bBlurOrKeyDownStarted;
+			delete this._fnGetControlText;
+			delete this._fnSetControlText;
 
 			sap.ui.getCore().getEventBus().publish("sap.ui.rta", sPluginMethodName, {
 				overlay: oOverlay