@openui5/sap.ui.rta 1.106.0 → 1.107.1

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.106.0
+	 * @version 1.107.1
 	 *
 	 * @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.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.34

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.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * Provides Rename handling functionality
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.101

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

@@ -30,7 +30,7 @@ function (
 	 * @class The Selection plugin allows you to select or focus overlays with mouse or keyboard and navigate to others.
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class The Settings allows trigger change of settings operations on the overlay
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.44

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.46

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/additionalElements/ActionExtractor.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * handled by the AdditionalElements Plugin (Reveal, Add Via Delegate, Add Custom)
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @since 1.94
 	 * @experimental Since 1.94. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/rta/plugin/additionalElements/AddElementsDialog.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @class Context - Dialog for available Fields in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsPlugin.js

@@ -75,7 +75,7 @@ sap.ui.define([
 	 * @class The plugin allows to add additional elements that exist either hidden in the UI or in the OData service
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsUtils.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Helper object containing methods for the AdditionalElements plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @since 1.94
 	 * @experimental Since 1.94. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/rta/plugin/additionalElements/CommandBuilder.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Helper object to build the RTA commands resulting from the AdditionalElements Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @since 1.94
 	 * @experimental Since 1.94. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/rta/plugin/iframe/AddIFrame.js

@@ -110,7 +110,7 @@ sap.ui.define([
 	 * @class The AddIFrame allows trigger AddIFrame operations on the overlay.
 	 * @extends sap.ui.rta.plugin.BaseCreate
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.75

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.js

@@ -113,7 +113,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.78

package/src/sap/ui/rta/service/Action.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted
 	 *

package/src/sap/ui/rta/service/ControllerExtension.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/Outline.js

@@ -16,7 +16,8 @@ sap.ui.define([
 	"sap/base/util/merge",
 	"sap/base/util/restricted/_omit",
 	"sap/ui/core/mvc/View",
-	"sap/base/Log"
+	"sap/base/Log",
+	"sap/ui/core/Configuration"
 ], function(
 	OverlayRegistry,
 	ElementOverlay,
@@ -29,7 +30,8 @@ sap.ui.define([
 	merge,
 	_omit,
 	View,
-	Log
+	Log,
+	Configuration
 ) {
 	"use strict";
 
@@ -42,7 +44,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.56
 	 * @since 1.56
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -182,7 +184,7 @@ sap.ui.define([
 		};
 
 		oOutline._enrichExtensionPointData = function (oData, oOverlay) {
-			var bIsDesignMode = sap.ui.getCore().getConfiguration().getDesignMode();
+			var bIsDesignMode = Configuration.getDesignMode();
 			if (!bIsDesignMode) {
 				return undefined;
 			}

package/src/sap/ui/rta/service/Property.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/Selection.js

@@ -15,7 +15,7 @@ sap.ui.define(function () {
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/SupportTools.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.106
 	 * @since 1.106
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/toolbar/Adaptation.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private
@@ -63,6 +63,7 @@ sap.ui.define([
 				activate: {},
 				discardDraft: {},
 				switchVersion: {},
+				saveAsContextBasedAdaptation: {},
 				openChangeCategorySelectionPopover: {}
 			}
 		}

package/src/sap/ui/rta/toolbar/AdaptationRenderer.js

@@ -13,8 +13,10 @@ sap.ui.define([
 
 	var AdaptationRenderer = BaseRenderer.extend("sap.ui.rta.toolbar.AdaptationRenderer");
 
+	AdaptationRenderer.apiVersion = 1; // @todo-semantic-rendering out of order .class() call before openStart
+
 	AdaptationRenderer.render = function (oRM, oControl) {
-		oRM.addClass("sapUiRtaToolbarAdaptation");
+		oRM.class("sapUiRtaToolbarAdaptation");
 
 		BaseRenderer.render(oRM, oControl);
 	};

package/src/sap/ui/rta/toolbar/Base.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/BaseRenderer.js

@@ -16,16 +16,18 @@ function(
 
 	var BaseRenderer = Renderer.extend.call(HBoxRenderer, "sap.ui.rta.toolbar.BaseRenderer");
 
+	BaseRenderer.apiVersion = 1; // @todo-semantic-rendering out of order .class() and .style() calls before openStart
+
 	BaseRenderer.render = function (oRM, oControl) {
-		oRM.addClass("sapUiRtaToolbar");
-		oRM.addClass("color_" + oControl.getColor());
+		oRM.class("sapUiRtaToolbar");
+		oRM.class("color_" + oControl.getColor());
 
 		// setting type if exists
-		oControl.type && oRM.addClass("type_" + oControl.type);
+		oControl.type && oRM.class("type_" + oControl.type);
 
 		// setting z-index if exists
 		var iZIndex = oControl.getZIndex();
-		iZIndex && oRM.addStyle("z-index", iZIndex);
+		iZIndex && oRM.style("z-index", iZIndex);
 
 		HBoxRenderer.render(oRM, oControl);
 	};

package/src/sap/ui/rta/toolbar/Fiori.js

@@ -32,7 +32,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/FioriLike.js

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/OverflowToolbarButton.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.OverflowToolbarButton
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Personalization.js

@@ -22,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Standalone.js

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/contextBased/SaveAsContextBasedAdaptation.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private
@@ -55,17 +55,9 @@ sap.ui.define([
 				name: "sap.ui.rta.toolbar.contextBased.SaveAsContextBasedAdaptationDialog",
 				id: this.getToolbar().getId() + "_fragment--sapUiRta_addAdaptationDialog",
 				controller: {
-					onAdaptationTitleChange: function (oEvent) {
-						this.sAdaptationTitle = oEvent.getParameter("value");
-						_validateAddAdaptationInput.call(this);
-					}.bind(this),
-					// TODO: implementation of save as context based adaptation
-					onSaveAsContextBasedAdaptation: function () {
-					},
-					onCancelContextBasedAdaptationDialog: function () {
-						_clearContexts.call(this);
-						this._oAddAdaptationDialog.close();
-					}.bind(this)
+					onAdaptationTitleChange: _onAdaptationTitleChange.bind(this),
+					onSaveAsContextBasedAdaptation: _onSaveAsContextBasedAdaptation.bind(this),
+					onCancelContextBasedAdaptationDialog: _onCancelContextBasedAdaptationDialog.bind(this)
 				}
 			}).then(function (oDialog) {
 				this._oAddAdaptationDialog = oDialog;
@@ -81,41 +73,42 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	function _onAdaptationTitleChange(oEvent) {
+		this.sAdaptationTitle = oEvent.getParameter("value");
+		_enableSaveAsButton.call(this);
+	}
+
+	function _onCancelContextBasedAdaptationDialog() {
+		_clearContexts.call(this);
+		this._oAddAdaptationDialog.close();
+	}
+
+	function _onSaveAsContextBasedAdaptation() {
+		var oContextBasedAdaptation = {};
+		oContextBasedAdaptation.title = getAdaptationTitle.call(this);
+		oContextBasedAdaptation.contexts = this._oContextComponentInstance.getSelectedContexts();
+		this.getToolbar().fireEvent("saveAsContextBasedAdaptation", oContextBasedAdaptation);
+	}
+
 	function createContextSharingComponent(sLayer) {
-		var mPropertyBag = { layer: sLayer || Layer.CUSTOMER, isAppContext: true };
+		var mPropertyBag = { layer: sLayer || Layer.CUSTOMER };
 		return ContextSharingAPI.createComponent(mPropertyBag).then(function (oContextSharingComponent) {
 			this._oContextComponent = oContextSharingComponent;
 			this._oContextComponentInstance = oContextSharingComponent.getComponentInstance();
-			this._oContextComponentInstance.setSelectedContexts({ role: [] });
+			this._oContextComponentInstance.resetSelectedContexts();
 			this._oAddAdaptationDialog.addContent(this._oContextComponent);
 			var oSelectedContextsModel = this._oContextComponentInstance.getSelectedContextsModel();
 			this.oSelectedContextsBinding = new Binding(oSelectedContextsModel, "/", oSelectedContextsModel.getContext("/"));
-			this.oSelectedContextsBinding.attachChange(onSelectedContextsChange.bind(this));
+			this.oSelectedContextsBinding.attachChange(_enableSaveAsButton.bind(this));
 		}.bind(this));
 	}
 
-	function onSelectedContextsChange() {
-		this.aSelectedRoles = this._oContextComponentInstance.getSelectedContexts().role;
-		_validateAddAdaptationInput.call(this);
-	}
-
-	function _validateAddAdaptationInput() {
-		if (getAdaptationTitle.call(this).length > 0 && getSelectedContexts.call(this).length > 0) {
-			_enableSaveAsButton.call(this, true);
-		} else {
-			_enableSaveAsButton.call(this, false);
-		}
-	}
-
 	function getAdaptationTitle() {
 		return this.sAdaptationTitle || "";
 	}
 
-	function getSelectedContexts() {
-		return this.aSelectedRoles || [];
-	}
-
-	function _enableSaveAsButton(bEnable) {
+	function _enableSaveAsButton() {
+		var bEnable = getAdaptationTitle.call(this).length > 0 && this._oContextComponentInstance.getSelectedContexts().role.length > 0;
 		this.getToolbar().getControl("addAdaptationDialog--saveContextBasedAdaptation-saveButton").setEnabled(bEnable);
 	}
 
@@ -124,7 +117,7 @@ sap.ui.define([
 			if (this._oContextComponent.isDestroyed()) {
 				return createContextSharingComponent.call(this);
 			}
-			this._oContextComponentInstance.setSelectedContexts({ role: [] });
+			this._oContextComponentInstance.resetSelectedContexts();
 			this._oAddAdaptationDialog.addContent(this._oContextComponent);
 		}
 	}

package/src/sap/ui/rta/toolbar/contextBased/SaveAsContextBasedAdaptationDialog.fragment.xml

@@ -1,4 +1,4 @@
-<core:FragmentDefinition xmlns:richtexteditor="sap.ui.richtexteditor"
+<core:FragmentDefinition
 	xmlns:form="sap.ui.layout.form"
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core">

package/src/sap/ui/rta/toolbar/translation/Translation.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/versioning/Versioning.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -148,13 +148,21 @@ function(
 	function getBindingsForAggregation(oElement, oModel, bTemplate, sAggregationName, oRelevantContainerElement) {
 		var aBindings = [];
 		var aElements = [];
+		var oTemplate;
 		var bIsInTemplate = bTemplate;
+		var oElementModel = oElement.getModel();
 
 		var oBinding = oElement.getBindingInfo(sAggregationName);
-		var oTemplate = oBinding && oBinding.template;
+		oTemplate = oBinding && oBinding.template;
 
-		// If a template is bound to the current element, we continue
-		// the evaluation on the template (as it has no direct parent)
+		// If a template is found for a different model, we don't look inside the template
+		// e.g. a Select control whose entries are defined in an own JSON model
+		if (oTemplate && oElementModel && oElementModel !== oModel) {
+			return [];
+		}
+
+		// If a template is bound to the current element on the given model,
+		// we continue the evaluation on the template (as it has no direct parent)
 		if (oTemplate) {
 			bIsInTemplate = true;
 			aElements = [oTemplate];
@@ -289,6 +297,7 @@ function(
 			.filter(function (sPropertyName) {
 				var mBindingInfo = oTemplate.mBindingInfos[sPropertyName];
 				var sModelName = mBindingInfo && mBindingInfo.parts[0] && mBindingInfo.parts[0].model;
+				bIsSameModel = oModel === oTemplateParent.getModel(sModelName);
 				if (!sModelName) {
 					var oParentDefaultModel = oTemplateParent.getDefaultModel ? oTemplateParent.getDefaultModel() : null;
 					var oTemplateDefaultModel = oTemplate.getDefaultModel ? oTemplate.getDefaultModel() : null;

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

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.86

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.106.0
+	 * @version 1.107.1
 	 * @constructor
 	 * @private
 	 * @since 1.48

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.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus

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

@@ -5,8 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/ui/thirdparty/jquery"
-], function(jQuery) {
+	"sap/ui/thirdparty/jquery", "sap/ui/core/Configuration"
+], function(jQuery, Configuration) {
 	"use strict";
 
 	var module = {};
@@ -20,7 +20,7 @@ sap.ui.define([
 		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 (sap.ui.getCore().getConfiguration().getRTL()) {
+					if (Configuration.getRTL()) {
 						return sData.replace(/right/g, 'left');
 					}
 					return sData;

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicator
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 */
 	var ChangeIndicator = Control.extend("sap.ui.rta.util.changeVisualization.ChangeIndicator", {
@@ -162,29 +162,29 @@ sap.ui.define([
 
 	function getTexts(mChangeInformation, oRtaResourceBundle, sOverlayId) {
 		var oAffectedElement = Core.byId(mChangeInformation.affectedElementId);
-		var mPayload = Object.keys(mChangeInformation.payload || {}).reduce(function(mPayload, sKey) {
-			var vOriginalValue = mChangeInformation.payload[sKey];
+		var mDescriptionPayload = Object.keys(mChangeInformation.descriptionPayload || {}).reduce(function(mDescriptionPayload, sKey) {
+			var vOriginalValue = mChangeInformation.descriptionPayload[sKey];
 			var bIsBinding = FlUtils.isBinding(vOriginalValue);
 			var vValue = bIsBinding
 				? resolveBinding(vOriginalValue, oAffectedElement)
 				: vOriginalValue;
-			mPayload[sKey] = vValue;
-			return mPayload;
+			mDescriptionPayload[sKey] = vValue;
+			return mDescriptionPayload;
 		}, {});
 
 		var mPropertyBag = { appComponent: FlUtils.getAppComponentForControl(oAffectedElement) };
 		var oOverlay = Core.byId(sOverlayId);
 		var sElementLabel = oOverlay.getDesignTimeMetadata().getLabel(oAffectedElement);
 		var oCommandVisualization = getCommandVisualization(mChangeInformation);
-		var oDescription = oCommandVisualization && oCommandVisualization.getDescription(mPayload, sElementLabel, mPropertyBag) || {};
+		var oDescription = oCommandVisualization && oCommandVisualization.getDescription(mDescriptionPayload, sElementLabel, mPropertyBag) || {};
 		var sCommandName = mChangeInformation.commandName;
 		var sDescriptionText;
 		var sDescriptionTooltip;
 
 		// 'Settings' with a custom description should overwrite the description from the CommandVisualization
-		if (sCommandName === "settings" && mPayload.description) {
-			oDescription.descriptionText = mPayload.description;
-			oDescription.descriptionTooltip = mPayload.descriptionTooltip;
+		if (sCommandName === "settings" && mDescriptionPayload.description) {
+			oDescription.descriptionText = mDescriptionPayload.description;
+			oDescription.descriptionTooltip = mDescriptionPayload.descriptionTooltip;
 		} else if (mChangeInformation.changeCategory === "other") {
 			// To retrieve the generic description for commands without visualization
 			sCommandName = "other";