@openui5/sap.m 1.103.0 → 1.105.0

package/src/sap/m/ViewSettingsCustomItem.js

@@ -22,7 +22,7 @@ sap.ui.define(['./ViewSettingsItem', './library'],
 	 * @extends sap.m.ViewSettingsItem
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsCustomTab.js

@@ -20,7 +20,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/core/IconPool'],
 			 * @extends sap.ui.core.Item
 			 *
 			 * @author SAP SE
-			 * @version 1.103.0
+			 * @version 1.105.0
 			 *
 			 * @constructor
 			 * @public

package/src/sap/m/ViewSettingsDialog.js

@@ -144,7 +144,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsFilterItem.js

@@ -24,7 +24,7 @@ sap.ui.define(['./ViewSettingsItem', './library'],
 	 * @extends sap.m.ViewSettingsItem
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsItem.js

@@ -25,7 +25,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/VisibleItem.js

@@ -21,7 +21,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', "sap/ui/thirdparty/jquery"],
 		 * @extends sap.ui.core.Item
 		 *
 		 * @author SAP SE
-		 * @version 1.103.0
+		 * @version 1.105.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/WheelSlider.js

@@ -28,7 +28,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.103.0
+		 * @version 1.105.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/WheelSliderContainer.js

@@ -31,7 +31,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.103.0
+		 * @version 1.105.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/Wizard.js

@@ -14,7 +14,6 @@ sap.ui.define([
 	"sap/ui/Device",
 	"./WizardRenderer",
 	"sap/ui/core/CustomData",
-	"sap/ui/dom/containsOrEquals",
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/dom/jquery/Focusable"
@@ -28,7 +27,6 @@ sap.ui.define([
 	Device,
 	WizardRenderer,
 	CustomData,
-	containsOrEquals,
 	Log,
 	jQuery
 ) {
@@ -86,7 +84,7 @@ sap.ui.define([
 		 *
 		 * @extends sap.ui.core.Control
 		 * @author SAP SE
-		 * @version 1.103.0
+		 * @version 1.105.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/WizardProgressNavigator.js

@@ -43,7 +43,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/WizardStep.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * <li>If the execution needs to branch after a given step, you should set all possible next steps in the <code>subsequentSteps</code> aggregation.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/changeHandler/AddTableColumn.js

@@ -16,19 +16,18 @@ sap.ui.define([
 	var CELLS_AGGREGATION_NAME = "cells";
 	var ITEMS_AGGREGATION_NAME = "items";
 
-	function getLabel(mChangeDefinition, mInnerControls, oModifier, oView, oAppComponent){
-		var sEntityType = ObjectPath.get("oDataInformation.entityType", mChangeDefinition);
+	function getLabel(oChangeContent, mInnerControls, oModifier, oView, oAppComponent, oChangeODataInformation){
+		var sEntityType = oChangeODataInformation && oChangeODataInformation.entityType;
 		if (sEntityType) {
-			var mContent = mChangeDefinition.content;
 			return Promise.resolve()
 				.then(oModifier.createControl.bind(
 					oModifier,
 					'sap.m.Text',
 					oAppComponent,
 					oView,
-					mContent.newFieldSelector.id + '--column',
+					oChangeContent.newFieldSelector.id + '--column',
 					{
-						text: "{/#" + sEntityType + "/" + mContent.bindingPath + "/@sap:label}"
+						text: "{/#" + sEntityType + "/" + oChangeContent.bindingPath + "/@sap:label}"
 					}
 				));
 		}
@@ -44,7 +43,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 *
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @experimental Since 1.51.0 This class is experimental and provides only limited functionality.
 	 * Also the API might be changed in future.
@@ -55,9 +54,9 @@ sap.ui.define([
 		aggregationName: COLUMNS_AGGREGATION_NAME,
 		parentAlias: "targetTable",
 		fieldSuffix: "--field",
-		skipCreateLabel: function(mPropertyBag) {
+		skipCreateLabel: function(oChangeODataInformation) {
 			//if entity type is given we create label ourselves
-			return !!ObjectPath.get("changeDefinition.oDataInformation.entityType", mPropertyBag);
+			return !!(oChangeODataInformation && oChangeODataInformation.entityType);
 		},
 		skipCreateLayout: true,
 		supportsDefault: true,
@@ -82,10 +81,10 @@ sap.ui.define([
 
 			var oChange = mPropertyBag.change;
 			var oRevertData = oChange.getRevertData();
-			var mChangeDefinition = oChange.getDefinition();
-			var mContent = mChangeDefinition.content;
-			var iIndex = mContent.newFieldIndex;
-			var mFieldSelector = mContent.newFieldSelector;
+			var oChangeContent = oChange.getContent();
+			var oChangeODataInformation = oChange.getODataInformation();
+			var iIndex = oChangeContent.newFieldIndex;
+			var mFieldSelector = oChangeContent.newFieldSelector;
 
 			return Promise.resolve()
 				.then(oModifier.getBindingTemplate.bind(oModifier,oTable, ITEMS_AGGREGATION_NAME, oView))
@@ -106,7 +105,7 @@ sap.ui.define([
 				})
 				.then(oModifier.createControl.bind(oModifier, 'sap.m.Column', oAppComponent, oView, mFieldSelector))
 				.then(function(oCreatedControl) {
-					return getLabel(mChangeDefinition, mInnerControls, oModifier, oView, oAppComponent)
+					return getLabel(oChangeContent, mInnerControls, oModifier, oView, oAppComponent, oChangeODataInformation)
 						.then(function(oLabel) {
 							return Promise.resolve()
 								.then(oModifier.insertAggregation.bind(oModifier, oCreatedControl, 'header', oLabel, 0, oView))

package/src/sap/m/changeHandler/ChangeLinkTarget.js

@@ -12,7 +12,7 @@ sap.ui.define(function () {
 	 *
 	 * @alias sap.m.changeHandler.ChangeLinkTarget
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @experimental Since 1.71
 	 */
 	var ChangeLinkTarget = {};
@@ -30,8 +30,7 @@ sap.ui.define(function () {
 	 */
 	ChangeLinkTarget.applyChange = function(oChange, oControl, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier;
-		var oChangeDefinition = oChange.getDefinition();
-		var sTarget = oChangeDefinition.content;
+		var sTarget = oChange.getContent();
 		return Promise.resolve()
 			.then(oModifier.getProperty.bind(oModifier, oControl, "target"))
 			.then(function(oProperty) {

package/src/sap/m/changeHandler/CombineButtons.js

@@ -6,13 +6,9 @@
 
 sap.ui.define([
 	"sap/base/util/uid",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/core/Component",
 	"sap/ui/fl/util/ManagedObjectModel" // used implicitly by oModifier.createControl() function
 ], function (
-	uid,
-	JsControlTreeModifier,
-	Component
+	uid
 ) {
 	"use strict";
 
@@ -21,14 +17,14 @@ sap.ui.define([
 	 *
 	 * @alias sap.m.changeHandler.CombineButtons
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @experimental Since 1.48
 	 */
 	var CombineButtons = {};
 
 	var sCombineButtonsModelName = "$sap.m.flexibility.CombineButtonsModel";
 
-	function fnHandleMenuItems(aButtons, oModifier, oAppComponent, oMenu, oParent, sParentAggregation, oView, oChangeDefinition, oRevertData) {
+	function fnHandleMenuItems(aButtons, oModifier, oAppComponent, oMenu, oParent, sParentAggregation, oView, oChangeContent, oRevertData) {
 		var sPropertyEnabled = "";
 		var sPropertyVisible = "";
 		var sOR = "";
@@ -41,7 +37,7 @@ sap.ui.define([
 			var iIndex = index;
 			var oMenuItem;
 			var oManagedObjectModel;
-			var oSelector = oChangeDefinition.content.buttonsIdForSave[iIndex];
+			var oSelector = oChangeContent.buttonsIdForSave[iIndex];
 			var sButtonText;
 			var sModelName = "$sap.m.flexibility.MenuButtonModel" + iIndex;
 			return oPreviousPromise
@@ -185,7 +181,7 @@ sap.ui.define([
 			return Promise.reject(new Error("Combine buttons change can't be applied on XML tree"));
 		}
 
-		var oChangeDefinition = oChange.getDefinition();
+		var oChangeContent = oChange.getContent();
 		var oModifier = mPropertyBag.modifier;
 		var oView = mPropertyBag.view;
 		var oAppComponent = mPropertyBag.appComponent;
@@ -204,12 +200,12 @@ sap.ui.define([
 		var aMenuButtonName = [];
 
 		return Promise.resolve()
-			.then(oModifier.bySelector.bind(oModifier, oChangeDefinition.content.combineButtonSelectors[0], oAppComponent, oView))
+			.then(oModifier.bySelector.bind(oModifier, oChangeContent.combineButtonSelectors[0], oAppComponent, oView))
 			.then(function(oReturnedSourceControl) {
 				oSourceControl = oReturnedSourceControl;
 				oParent = oModifier.getParent(oSourceControl); // === oControl
 				var aPromises = [];
-				oChangeDefinition.content.combineButtonSelectors.forEach(function(oCombineButtonSelector) {
+				oChangeContent.combineButtonSelectors.forEach(function(oCombineButtonSelector) {
 					var oPromise = Promise.resolve()
 						.then(oModifier.bySelector.bind(oModifier, oCombineButtonSelector, oAppComponent, oView));
 					aPromises.push(oPromise);
@@ -227,7 +223,7 @@ sap.ui.define([
 			})
 			.then(function(iAggrIndex){
 				iAggregationIndex = iAggrIndex;
-				return oModifier.createControl("sap.m.Menu", oAppComponent, oView, oChangeDefinition.content.menuIdSelector);
+				return oModifier.createControl("sap.m.Menu", oAppComponent, oView, oChangeContent.menuIdSelector);
 			})
 			.then(function(oCreatedMenu){
 				oMenu = oCreatedMenu;
@@ -246,7 +242,7 @@ sap.ui.define([
 					oParent,
 					sParentAggregation,
 					oView,
-					oChangeDefinition,
+					oChangeContent,
 					oRevertData);
 			})
 			// Create MenuButton
@@ -259,7 +255,7 @@ sap.ui.define([
 					"sap.m.MenuButton",
 					oAppComponent,
 					oView,
-					oChangeDefinition.content.menuButtonIdSelector,
+					oChangeContent.menuButtonIdSelector,
 					{
 						visible: "{= " + sPropertyVisible + "}",
 						enabled: "{= " + sPropertyEnabled + "}"
@@ -315,18 +311,18 @@ sap.ui.define([
 		var oModifier = mPropertyBag.modifier;
 		var oView = mPropertyBag.view;
 		var oRevertData = oChange.getRevertData();
-		var oChangeDefinition = oChange.getDefinition();
+		var oChangeContent = oChange.getContent();
 		var sParentAggregation = oRevertData.parentAggregation;
 		var oMenuButton, oParent, aButtonsIdsReversed;
 
 		return Promise.resolve()
 			.then(function(){
-				return oModifier.bySelector(oChangeDefinition.content.menuButtonIdSelector, mPropertyBag.appComponent, oView);
+				return oModifier.bySelector(oChangeContent.menuButtonIdSelector, mPropertyBag.appComponent, oView);
 			})
 			.then(function(oRetrievedButton) {
 				oMenuButton = oRetrievedButton;
 				oParent = oModifier.getParent(oMenuButton);
-				aButtonsIdsReversed = oChangeDefinition.content.combineButtonSelectors.slice().reverse();
+				aButtonsIdsReversed = oChangeContent.combineButtonSelectors.slice().reverse();
 				// FIXME: fix implementation of ObjectPageDynamicHeaderTitle and remove next line
 				return oModifier.removeAggregation(oParent, sParentAggregation, oMenuButton);
 			})
@@ -374,23 +370,24 @@ sap.ui.define([
 	CombineButtons.completeChangeContent = function(oChange, oSpecificChangeInfo, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier;
 		var oAppComponent = mPropertyBag.appComponent;
-		var oChangeDefinition = oChange.getDefinition();
 		var aCombineButtonIds = oSpecificChangeInfo.combineElementIds;
 
 		if (aCombineButtonIds && aCombineButtonIds.length > 1) {
+			var oContent = {};
 			oChange.addDependentControl(aCombineButtonIds, "combinedButtons", mPropertyBag);
-			oChangeDefinition.content.combineButtonSelectors = aCombineButtonIds.map(function (sCombineButtonId) {
+			oContent.combineButtonSelectors = aCombineButtonIds.map(function (sCombineButtonId) {
 				return oModifier.getSelector(sCombineButtonId, oAppComponent);
 			});
 
 			// generate ids for Menu and MenuButton
-			oChangeDefinition.content.menuButtonIdSelector = oModifier.getSelector(oAppComponent.createId(uid()), oAppComponent);
-			oChangeDefinition.content.menuIdSelector = oModifier.getSelector(oAppComponent.createId(uid()), oAppComponent);
+			oContent.menuButtonIdSelector = oModifier.getSelector(oAppComponent.createId(uid()), oAppComponent);
+			oContent.menuIdSelector = oModifier.getSelector(oAppComponent.createId(uid()), oAppComponent);
 
 			// generate id for menu button items
-			oChangeDefinition.content.buttonsIdForSave = aCombineButtonIds.map(function() {
+			oContent.buttonsIdForSave = aCombineButtonIds.map(function() {
 				return oModifier.getSelector(oAppComponent.createId(uid()), oAppComponent);
 			});
+			oChange.setContent(oContent);
 		} else {
 			throw new Error("Combine buttons action cannot be completed: oSpecificChangeInfo.combineElementIds attribute required");
 		}

package/src/sap/m/changeHandler/MoveTableColumns.js

@@ -5,7 +5,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["sap/base/Log", "sap/ui/thirdparty/jquery"], function(Log, jQuery) {
+sap.ui.define(["sap/base/Log"], function(Log) {
 	"use strict";
 
 	/**
@@ -13,7 +13,7 @@ sap.ui.define(["sap/base/Log", "sap/ui/thirdparty/jquery"], function(Log, jQuery
 	 *
 	 * @alias sap.m.changeHandler.MoveTableColumns
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @experimental Since 1.48
 	 */
 	var MoveTableColumns = {};
@@ -113,7 +113,7 @@ sap.ui.define(["sap/base/Log", "sap/ui/thirdparty/jquery"], function(Log, jQuery
 							iCurrentIndexInAggregation = aColumns.indexOf(oMovedElement);
 							iStoredSourceIndexInChange = mMovedElement.sourceIndex;
 							iTargetIndex = typeof fnIterator === "function" && fnIterator(iStoredSourceIndexInChange);
-							iTargetIndex = jQuery.isNumeric(iTargetIndex) ? iTargetIndex : mMovedElement.targetIndex;
+							iTargetIndex = typeof iTargetIndex === "number" ? iTargetIndex : mMovedElement.targetIndex;
 
 							if (iCurrentIndexInAggregation !== iTargetIndex) {
 								// By default we are getting the index from the aggregation, because it is possible that the order is
@@ -213,7 +213,6 @@ sap.ui.define(["sap/base/Log", "sap/ui/thirdparty/jquery"], function(Log, jQuery
 	MoveTableColumns.completeChangeContent = function (oChange, mSpecificChangeInfo, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier;
 		var oAppComponent = mPropertyBag.appComponent;
-		var mChangeData = oChange.getDefinition();
 		var oSourceControl = oModifier.bySelector(mSpecificChangeInfo.source.id, oAppComponent);
 		var oTargetControl = oModifier.bySelector(mSpecificChangeInfo.target.id, oAppComponent);
 		var mAdditionalSourceInfo = {
@@ -226,17 +225,18 @@ sap.ui.define(["sap/base/Log", "sap/ui/thirdparty/jquery"], function(Log, jQuery
 		};
 
 		// We need to add the information about the movedElements together with the source and target index
-		mChangeData.content = {movedElements: []};
+		var oContent = {movedElements: []};
 		mSpecificChangeInfo.movedElements.forEach(function (mElement) {
 			var oElement = mElement.element || oModifier.bySelector(mElement.id, oAppComponent);
 
-			mChangeData.content.movedElements.push({
+			oContent.movedElements.push({
 				selector: oModifier.getSelector(oElement, oAppComponent),
 				sourceIndex: mElement.sourceIndex,
 				targetIndex: mElement.targetIndex
 			});
 		});
 
+		oChange.setContent(oContent);
 		oChange.addDependentControl(mSpecificChangeInfo.source.id, SOURCE_ALIAS, mPropertyBag, mAdditionalSourceInfo);
 		oChange.addDependentControl(mSpecificChangeInfo.target.id, TARGET_ALIAS, mPropertyBag, mAdditionalTargetInfo);
 		oChange.addDependentControl(mSpecificChangeInfo.movedElements.map(function (element) {

package/src/sap/m/changeHandler/SelectIconTabBarFilter.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.m.changeHandler.SelectIconTabBarFilter
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @experimental Since 1.96
 	 */
 	var SelectIconTabBarFilter = {};
@@ -31,16 +31,16 @@ sap.ui.define([
 	 */
 	SelectIconTabBarFilter.applyChange = function (oChange, oControl, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier;
-		var oChangeDefinition = oChange.getDefinition();
+		var oChangeContent = oChange.getContent();
 
 		// Make sure the "select" event of the control is fired.
 		// By default it is not fired when the "selectedKey" property is changed,
 		// but only via user interaction
-		oControl._bFireSelectEvent = oChangeDefinition.content.fireEvent;
-		oModifier.setProperty(oControl, "selectedKey", oChangeDefinition.content.selectedKey);
+		oControl._bFireSelectEvent = oChangeContent.fireEvent;
+		oModifier.setProperty(oControl, "selectedKey", oChangeContent.selectedKey);
 		oControl._bFireSelectEvent = false;
 
-		oChange.setRevertData({key:oChangeDefinition.content.previousSelectedKey, fireEvent: oChangeDefinition.content.fireEvent});
+		oChange.setRevertData({key:oChangeContent.previousSelectedKey, fireEvent: oChangeContent.fireEvent});
 	};
 
 	/**

package/src/sap/m/changeHandler/SplitMenuButton.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.m.changeHandler.SplitMenuButton
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @experimental Since 1.48
 	 */
 	var SplitMenuButton = {};
@@ -43,7 +43,7 @@ sap.ui.define([
 			return Promise.reject(new Error("Split change can't be applied on XML tree"));
 		}
 
-		var oChangeDefinition = oChange.getDefinition();
+		var oChangeContent = oChange.getContent();
 		var oModifier = mPropertyBag.modifier;
 		var oView = mPropertyBag.view;
 		var oAppComponent = mPropertyBag.appComponent;
@@ -77,7 +77,7 @@ sap.ui.define([
 			})
 			.then(function(iRetrievedAggregationIndex) {
 				iAggregationIndex = iRetrievedAggregationIndex;
-				aNewElementSelectors = oChangeDefinition.content.newElementIds;
+				aNewElementSelectors = oChangeContent.newElementIds;
 				oRevertData = {
 					parentAggregation: sParentAggregation,
 					insertIndex: iAggregationIndex,
@@ -228,7 +228,6 @@ sap.ui.define([
 	SplitMenuButton.completeChangeContent = function(oChange, oSpecificChangeInfo, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier;
 		var oAppComponent = mPropertyBag.appComponent;
-		var oChangeDefinition = oChange.getDefinition();
 
 		if (!oSpecificChangeInfo.newElementIds) {
 			throw new Error("Split of MenuButton cannot be applied : oSpecificChangeInfo.newElementIds attribute required");
@@ -239,10 +238,12 @@ sap.ui.define([
 		}
 
 		oChange.addDependentControl(oSpecificChangeInfo.sourceControlId, SOURCE_CONTROL, mPropertyBag);
-		oChangeDefinition.content.sourceSelector = oModifier.getSelector(oSpecificChangeInfo.sourceControlId, oAppComponent);
-		oChangeDefinition.content.newElementIds = oSpecificChangeInfo.newElementIds.map(function (sElementId) {
+		var oContent = {};
+		oContent.sourceSelector = oModifier.getSelector(oSpecificChangeInfo.sourceControlId, oAppComponent);
+		oContent.newElementIds = oSpecificChangeInfo.newElementIds.map(function (sElementId) {
 			return oModifier.getSelector(sElementId, oAppComponent);
 		});
+		oChange.setContent(oContent);
 	};
 
 	/**

package/src/sap/m/delegate/DateNavigation.js

@@ -6,16 +6,12 @@
 
 sap.ui.define([
 	'sap/ui/base/EventProvider',
-	'sap/ui/core/date/UniversalDate',
 	'sap/ui/unified/calendar/CalendarUtils',
-	'sap/ui/unified/calendar/CalendarDate',
 	'sap/ui/unified/library'
 ],
 	function(
 		EventProvider,
-		UniversalDate,
 		CalendarUtils,
-		CalendarDate,
 		unifiedLibrary
 	) {
 		"use strict";

package/src/sap/m/designtime/Link.designtime.js

@@ -5,34 +5,36 @@
  */
 
 // Provides the Design Time Metadata for the sap.m.Link control
-sap.ui.define(["sap/ui/model/json/JSONModel"],
-	function (JSONModel) {
+sap.ui.define(["sap/base/util/Deferred", "sap/ui/core/Fragment", "sap/ui/model/json/JSONModel"],
+	function (Deferred, Fragment, JSONModel) {
 		"use strict";
 
-	var oSelectTargetDialog = function(oControl, mPropertyBag) {
+	var fnSelectTargetDialog = function(oControl, mPropertyBag) {
 		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.m.designtime");
-		return new Promise(function(fnResolve) {
+		return Fragment.load({
+			name: "sap.m.designtime.LinkTargetSelectDialog"
+		}).then(function(oDialog) {
 
-			var data = {
+			var oModel = new JSONModel({
 				selectedKey : oControl.getTarget(),
 				titleText : oTextResources.getText("LINK_DIALOG_TITLE_CHANGE_TARGET"),
 				cancelBtn : oTextResources.getText("LINK_DIALOG_CANCEL_BTN"),
 				okBtn : oTextResources.getText("LINK_DIALOG_OK_BTN")
-			};
-			var oModel = new JSONModel();
-			oModel.setData(data);
+			});
 
-			var oDialog = sap.ui.xmlfragment("sap.m.designtime.LinkTargetSelectDialog", this);
 			oDialog.setModel(oModel);
 
+			var oDeferred = new Deferred();
+
 			oDialog.getBeginButton().attachPress(function(oEvent) {
 				var sTargetValue = sap.ui.getCore().byId("targetCombo").getValue();
 
-				fnResolve(sTargetValue);
+				oDeferred.resolve(sTargetValue);
 				oDialog.close();
 			});
 
 			oDialog.getEndButton().attachPress(function(oEvent) {
+				oDeferred.resolve(undefined);
 				oDialog.close();
 			});
 
@@ -42,8 +44,14 @@ sap.ui.define(["sap/ui/model/json/JSONModel"],
 
 			oDialog.addStyleClass(mPropertyBag.styleClass);
 			oDialog.open();
+
+			return oDeferred.promise;
 		}).then(
 				function (sTargetValue) {
+					if ( sTargetValue === undefined ) {
+						// no change (cancel)
+						return [];
+					}
 					return [{
 						selectorControl : oControl,
 						changeSpecificData : {
@@ -86,7 +94,7 @@ sap.ui.define(["sap/ui/model/json/JSONModel"],
 						isEnabled: function(oControl){
 							return !!oControl.getHref();
 						},
-						handler: oSelectTargetDialog
+						handler: fnSelectTargetDialog
 					}
 				};
 			}

package/src/sap/m/designtime/VariantManagement.designtime.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -13,16 +13,43 @@ sap.ui.define([
 	return {
 		annotations: {},
 		properties: {
-			showSetAsDefault: {
+			supportDefault: {
 				ignore: false
 			},
-			inErrorState: {
+			supportFavorites: {
+				ignore: false
+			},
+			supportApplyAutomatically: {
+				ignore: false
+			},
+			supportPublic: {
+				ignore: false
+			},
+			supportContexts: {
+				ignore: false
+			},
+			selectedKey: {
+				ignore: false
+			},
+			defaultKey: {
 				ignore: false
 			},
-			editable: {
+			showSaveAs: {
 				ignore: false
 			},
-			modelName: {
+			creationAllowed: {
+				ignore: false
+			},
+			showFooter: {
+				ignore: false
+			},
+			modified: {
+				ignore: false
+			},
+			popoverTitle: {
+				ignore: false
+			},
+			inErrorState: {
 				ignore: false
 			},
 			executeOnSelectionForStandardDefault: {
@@ -30,27 +57,10 @@ sap.ui.define([
 			},
 			displayTextForExecuteOnSelectionForStandardVariant: {
 				ignore: false
+			},
+			level: {
+				ignore: false
 			}
-		},
-		actions: {
-//			controlVariant: function(oVariantManagement) {
-//				var oAppComponent = flUtils.getAppComponentForControl(oVariantManagement);
-//				var sControlId = oVariantManagement.getId();
-//				var oModel = oAppComponent.getModel(flUtils.VARIANT_MODEL_NAME);
-//				var sVariantManagementReference = oAppComponent.getLocalId(sControlId) || sControlId;
-//				return {
-//					validators: [
-//						"noEmptyText",
-//						{
-//							validatorFunction: function(sNewText) {
-//								var iDuplicateCount = oModel._getVariantTitleCount(sNewText, sVariantManagementReference) || 0;
-//								return iDuplicateCount === 0;
-//							},
-//							errorMessage: sap.ui.getCore().getLibraryResourceBundle("sap.ui.fl").getText("VARIANT_MANAGEMENT_ERROR_DUPLICATE")
-//						}
-//					]
-//				};
-//			}
 		}
 	};
 });