@openui5/sap.m 1.120.7 → 1.121.0

package/src/sap/m/DatePickerRenderer.js

@@ -3,8 +3,8 @@
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define(['sap/ui/core/Renderer', './DateTimeFieldRenderer', 'sap/ui/core/library'],
-	function(Renderer, DateTimeFieldRenderer, coreLibrary) {
+sap.ui.define(["sap/ui/core/Lib", 'sap/ui/core/Renderer', './DateTimeFieldRenderer', 'sap/ui/core/library'],
+	function(Library, Renderer, DateTimeFieldRenderer, coreLibrary) {
 	"use strict";
 
 	/**
@@ -48,7 +48,7 @@ sap.ui.define(['sap/ui/core/Renderer', './DateTimeFieldRenderer', 'sap/ui/core/l
 	DatePickerRenderer.getAccessibilityState = function(oDP) {
 		var mAccessibilityState = DateTimeFieldRenderer.getAccessibilityState.apply(this, arguments);
 
-		mAccessibilityState["roledescription"] = sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_DATEINPUT");
+		mAccessibilityState["roledescription"] = Library.getResourceBundleFor("sap.m").getText("ACC_CTR_TYPE_DATEINPUT");
 		if (oDP.getEditable() && oDP.getEnabled()) {
 			mAccessibilityState["haspopup"] = coreLibrary.aria.HasPopup.Grid.toLowerCase();
 		}

package/src/sap/m/DateRangeSelection.js

@@ -6,9 +6,12 @@
 
 // Provides control sap.m.DateRangeSelection.
 sap.ui.define([
+	"sap/base/i18n/Formatting",
 	'sap/ui/Device',
 	'./DatePicker',
 	'./library',
+	"sap/ui/core/Lib",
+	"sap/ui/core/Locale",
 	'sap/ui/core/LocaleData',
 	'sap/ui/core/format/DateFormat',
 	'sap/ui/core/date/UniversalDate',
@@ -18,16 +21,17 @@ sap.ui.define([
 	"sap/base/util/deepEqual",
 	"sap/base/Log",
 	"sap/base/assert",
-	"sap/ui/core/Configuration",
 	"sap/ui/core/date/UI5Date",
-	"sap/ui/core/Core",
 	// jQuery Plugin "cursorPos"
 	"sap/ui/dom/jquery/cursorPos"
 ],
 	function(
+		Formatting,
 		Device,
 		DatePicker,
 		library,
+		Library,
+		Locale,
 		LocaleData,
 		DateFormat,
 		UniversalDate,
@@ -37,9 +41,7 @@ sap.ui.define([
 		deepEqual,
 		Log,
 		assert,
-		Configuration,
-		UI5Date,
-		Core
+		UI5Date
 	) {
 	"use strict";
 
@@ -100,7 +102,8 @@ sap.ui.define([
 	 *
 	 * <ul><li>Use the <code>value</code> property if the date range is already provided as
 	 * a formatted string</li>
-	 * @example <caption> binding the <code>value</code> property by using types </caption>
+	 * <caption> binding the <code>value</code> property by using types </caption>
+	 * <pre>
 	 * new sap.ui.model.json.JSONModel({start:'2022-11-10', end:'2022-11-15'});
 	 *
 	 * new sap.m.DateRangeSelection({
@@ -125,7 +128,7 @@ sap.ui.define([
 	 *         }}]
 	 *     }
 	 * });
-	 *
+	 * </pre>
 	 * <b>Note:</b> There are multiple binding type choices, such as:
 	 * sap.ui.model.type.Date
 	 * sap.ui.model.odata.type.DateTime
@@ -165,8 +168,8 @@ sap.ui.define([
 	 * compact mode and provides a touch-friendly size in cozy mode.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.120.7
-	 * @version 1.120.7
+	 * @version 1.121.0
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -276,7 +279,7 @@ sap.ui.define([
 
 		if (!sPlaceholder) {
 			oBinding = this.getBinding("value");
-			oLocale = Configuration.getFormatSettings().getFormatLocale();
+			oLocale = new Locale(Formatting.getLanguageTag());
 			oLocaleData = LocaleData.getInstance(oLocale);
 
 			if (oBinding && oBinding.getType() && oBinding.getType().isA("sap.ui.model.type.DateInterval")) {
@@ -1092,7 +1095,7 @@ sap.ui.define([
 		var oRenderer = this.getRenderer();
 		var oInfo = DatePicker.prototype.getAccessibilityInfo.apply(this, arguments);
 		var sValue = this.getValue() || "";
-		var sRequired = this.getRequired() ? Core.getLibraryResourceBundle("sap.m").getText("ELEMENT_REQUIRED") : '';
+		var sRequired = this.getRequired() ? Library.getResourceBundleFor("sap.m").getText("ELEMENT_REQUIRED") : '';
 
 		if (this._bValid) {
 			var oDate = this.getDateValue();
@@ -1100,7 +1103,7 @@ sap.ui.define([
 				sValue = this._formatValue(oDate, this.getSecondDateValue());
 			}
 		}
-		oInfo.type = Core.getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_DATERANGEINPUT");
+		oInfo.type = Library.getResourceBundleFor("sap.m").getText("ACC_CTR_TYPE_DATERANGEINPUT");
 		oInfo.description = [sValue || this._getPlaceholder(), oRenderer.getLabelledByAnnouncement(this), oRenderer.getDescribedByAnnouncement(this), sRequired].join(" ").trim();
 		return oInfo;
 	};
@@ -1305,7 +1308,7 @@ sap.ui.define([
 
 		if (!sDelimiter) {
 			if (!this._sLocaleDelimiter) {
-				var oLocale = Configuration.getFormatSettings().getFormatLocale();
+				var oLocale = new Locale(Formatting.getLanguageTag());
 				var oLocaleData = LocaleData.getInstance(oLocale);
 				var sPattern = oLocaleData.getIntervalPattern();
 				var iIndex1 = sPattern.indexOf("{0}") + 3;

package/src/sap/m/DateRangeSelectionRenderer.js

@@ -3,8 +3,8 @@
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define(['sap/ui/core/Renderer', './DatePickerRenderer'],
-	function(Renderer, DatePickerRenderer) {
+sap.ui.define(["sap/ui/core/Lib", 'sap/ui/core/Renderer', './DatePickerRenderer'],
+	function(Library, Renderer, DatePickerRenderer) {
 	"use strict";
 
 
@@ -36,7 +36,7 @@ sap.ui.define(['sap/ui/core/Renderer', './DatePickerRenderer'],
 	DateRangeSelectionRenderer.getAccessibilityState = function(oDP) {
 		var mAccessibilityState = DatePickerRenderer.getAccessibilityState.apply(this, arguments);
 
-		mAccessibilityState["roledescription"] = sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_DATERANGEINPUT");
+		mAccessibilityState["roledescription"] = Library.getResourceBundleFor("sap.m").getText("ACC_CTR_TYPE_DATERANGEINPUT");
 
 		return mAccessibilityState;
 	};

package/src/sap/m/DateTimeField.js

@@ -6,12 +6,14 @@
 
 // Provides control sap.m.DateTimeField.
 sap.ui.define([
+	"sap/base/i18n/Formatting",
+	"sap/ui/core/Lib",
+	"sap/ui/core/Locale",
 	'sap/ui/model/type/Date',
 	'sap/ui/model/odata/type/ODataType',
 	'sap/ui/model/odata/type/DateTimeBase',
 	'./InputBase',
 	'./ValueStateHeader',
-	'sap/ui/core/Core',
 	'sap/ui/core/LocaleData',
 	'sap/ui/core/library',
 	'sap/ui/core/format/DateFormat',
@@ -19,18 +21,19 @@ sap.ui.define([
 	"sap/base/util/deepEqual",
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/core/Configuration",
 	'sap/ui/core/date/UI5Date',
 	'sap/ui/unified/calendar/CalendarUtils',
 	// jQuery Plugin "cursorPos"
 	"sap/ui/dom/jquery/cursorPos"
 ], function(
+	Formatting,
+	Library,
+	Locale,
 	SimpleDateType,
 	ODataType,
 	DateTimeBase,
 	InputBase,
 	ValueStateHeader,
-	Core,
 	LocaleData,
 	coreLibrary,
 	DateFormat,
@@ -38,7 +41,6 @@ sap.ui.define([
 	deepEqual,
 	Log,
 	jQuery,
-	Configuration,
 	UI5Date,
 	CalendarUtils
 ) {
@@ -65,7 +67,7 @@ sap.ui.define([
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -403,7 +405,7 @@ sap.ui.define([
 
 	DateTimeField.prototype._getLocaleBasedPattern = function (sPlaceholder) {
 		return LocaleData.getInstance(
-			Configuration.getFormatSettings().getFormatLocale()
+			new Locale(Formatting.getLanguageTag())
 		).getDatePattern(sPlaceholder);
 	};
 
@@ -532,7 +534,7 @@ sap.ui.define([
 		}
 
 		if (!sCalendarType) {
-			sCalendarType = Configuration.getCalendarType();
+			sCalendarType = Formatting.getCalendarType();
 		}
 
 		if (bDisplayFormat) {
@@ -606,7 +608,7 @@ sap.ui.define([
 		}
 
 		if (oBindingType instanceof ODataType && oBindingType.getFormat) {
-			return oBindingType.getFormat().oFormatOptions.pattern;
+			return  oBindingType.getFormat().oFormatOptions.pattern;
 		}
 
 		return undefined;
@@ -641,13 +643,19 @@ sap.ui.define([
 		if (sValueState === ValueState.None) {
 			sText = "";
 		} else {
-			oResourceBundle = Core.getLibraryResourceBundle("sap.ui.core");
+			oResourceBundle = Library.getResourceBundleFor("sap.ui.core");
 			sText = oResourceBundle.getText("VALUE_STATE_" + sValueState.toUpperCase());
 		}
 
 		return sText;
 	};
 
+	// support for SemanticFormElement
+	DateTimeField.prototype.getFormFormattedValue = function() {
+		var oDate = this.getDateValue();
+		return this._formatValue(oDate);
+	};
+
 	return DateTimeField;
 
 });

package/src/sap/m/DateTimeInput.js

@@ -6,6 +6,8 @@
 
 // Provides control sap.m.DateTimeInput.
 sap.ui.define([
+	"sap/base/i18n/Formatting",
+	"sap/ui/core/Locale",
 	"sap/ui/thirdparty/jquery",
 	'sap/ui/core/Control',
 	'./library',
@@ -19,10 +21,11 @@ sap.ui.define([
 	'sap/ui/core/library',
 	'sap/ui/Device',
 	"./DateTimeInputRenderer",
-	"sap/ui/core/Configuration",
 	"sap/ui/core/date/UI5Date"
 ],
 function(
+	Formatting,
+	Locale,
 	jQuery,
 	Control,
 	library,
@@ -36,7 +39,6 @@ function(
 	coreLibrary,
 	Device,
 	DateTimeInputRenderer,
-	Configuration,
 	UI5Date
 ) {
 	"use strict";
@@ -66,7 +68,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -295,7 +297,7 @@ function(
 
 			case DateTimeInputType.Time:
 				oPicker = new TimePicker(this.getId() + "-Picker",
-					{localeId: Configuration.getFormatSettings().getFormatLocale().toString()});
+					{localeId: new Locale(Formatting.getLanguageTag()).toString()});
 				break;
 
 			default: // default is date

package/src/sap/m/DateTimePicker.js

@@ -6,6 +6,10 @@
 
 //Provides control sap.m.DateTimePicker.
 sap.ui.define([
+	"sap/base/i18n/Formatting",
+	"sap/base/i18n/Localization",
+	"sap/ui/core/Lib",
+	"sap/ui/core/Locale",
 	"sap/ui/thirdparty/jquery",
 	'./InputBase',
 	'./DatePicker',
@@ -16,7 +20,6 @@ sap.ui.define([
 	'sap/ui/Device',
 	'sap/ui/core/format/DateFormat',
 	'sap/ui/core/LocaleData',
-	'sap/ui/core/Core',
 	'sap/ui/core/format/TimezoneUtil',
 	'./TimePickerClocks',
 	'./DateTimePickerRenderer',
@@ -26,10 +29,14 @@ sap.ui.define([
 	'./Button',
 	'sap/ui/core/IconPool',
 	"sap/ui/core/Theming",
-	'sap/ui/core/Configuration',
 	'sap/ui/core/date/UI5Date',
-	'sap/ui/dom/jquery/cursorPos' // provides jQuery.fn.cursorPos
+	// provides jQuery.fn.cursorPos
+	'sap/ui/dom/jquery/cursorPos'
 ], function(
+	Formatting,
+	Localization,
+	Library,
+	Locale,
 	jQuery,
 	InputBase,
 	DatePicker,
@@ -40,7 +47,6 @@ sap.ui.define([
 	Device,
 	DateFormat,
 	LocaleData,
-	Core,
 	TimezoneUtil,
 	TimePickerClocks,
 	DateTimePickerRenderer,
@@ -50,7 +56,6 @@ sap.ui.define([
 	Button,
 	IconPool,
 	Theming,
-	Configuration,
 	UI5Date
 ) {
 	"use strict";
@@ -105,7 +110,8 @@ sap.ui.define([
 	 * <ul><li>Use the <code>value</code> property if you want to bind the
 	 * <code>DateTimePicker</code> to a model using the
 	 * <code>sap.ui.model.type.DateTime</code></li>
-	 * @example <caption> binding the <code>value</code> property by using types </caption>
+     * <caption> binding the <code>value</code> property by using types </caption>
+	 * <pre>
 	 * new sap.ui.model.json.JSONModel({date: sap.ui.core.date.UI5Date.getInstance(2022,10,10,12,10,10)});
 	 *
 	 * new sap.m.DateTimePicker({
@@ -114,10 +120,11 @@ sap.ui.define([
 	 *         path: "/date"
 	 *     }
 	 * });
-	 *
+	 * </pre>
 	 * <li>Use the <code>value</code> property if the date is provided as a string from
 	 * the backend or inside the app (for example, as ABAP type DATS field)</li>
-	 * @example <caption> binding the <code>value</code> property by using types </caption>
+     * <caption> binding the <code>value</code> property by using types </caption>
+	 * <pre>
 	 * new sap.ui.model.json.JSONModel({date:"2022-11-10-12-10-10"});
 	 *
 	 * new sap.m.DateTimePicker({
@@ -131,7 +138,7 @@ sap.ui.define([
 	 *          }
 	 *     }
 	 * });
-	 *
+	 * </pre>
 	 * <b>Note:</b> There are multiple binding type choices, such as:
 	 * sap.ui.model.type.Date
 	 * sap.ui.model.odata.type.DateTime
@@ -176,7 +183,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -349,7 +356,7 @@ sap.ui.define([
 			var oSwitcher = this.getAggregation("_switcher");
 
 			if (!oSwitcher) {
-				var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+				var oResourceBundle = Library.getResourceBundleFor("sap.m");
 				var sDateText = oResourceBundle.getText("DATETIMEPICKER_DATE");
 				var sTimeText = oResourceBundle.getText("DATETIMEPICKER_TIME");
 
@@ -444,10 +451,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * This setter is overriden because the property is inherited from <code>DatePicker</code> but its usage makes no sense
-	 * in <code>DateTimePicker</code> as it always have footer with buttons. Setting the property won't have an effect at all.
+	 * This setter is overridden because the property is inherited from <code>DatePicker</code> but its usage makes no sense
+	 * in <code>DateTimePicker</code> as it always has a footer with buttons. Setting the property won't have an effect at all.
+	 * @param {boolean} _bFlag Whether to show a footer (ignored, footer will always be shown)
+	 * @returns {this}
 	 */
-	DateTimePicker.prototype.setShowFooter = function() {
+	DateTimePicker.prototype.setShowFooter = function(_bFlag) {
 		return this;
 	};
 
@@ -677,13 +686,13 @@ sap.ui.define([
 			offsetX: 0,
 			offsetY: 3,
 			horizontalScrolling: false,
-			title: this._getTimezone(true)
+			title: this._getTranslatedTimezone(true)
 		});
 
 		this.addDependent(this._oTimezonePopup);
 
 		if (Device.system.phone) {
-			oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+			oResourceBundle = Library.getResourceBundleFor("sap.m");
 
 			this._oTimezonePopup.setEndButton(new Button({
 				text: oResourceBundle.getText("SUGGESTIONSPOPOVER_CLOSE_BUTTON"),
@@ -768,7 +777,7 @@ sap.ui.define([
 		if (oFormatOptions.calendarType === undefined) {
 			oFormatOptions.calendarType = bDisplayFormat
 				? this.getDisplayFormatType()
-				: Configuration.getCalendarType();
+				: Formatting.getCalendarType();
 		}
 
 		if (oFormatOptions.strictParsing === undefined) {
@@ -829,7 +838,7 @@ sap.ui.define([
 			return oBinding.aValues[1];
 		}
 
-		return this.getTimezone() || (bUseDefaultAsFallback && Core.getConfiguration().getTimezone());
+		return this.getTimezone() || (bUseDefaultAsFallback && Localization.getTimezone());
 	};
 
 
@@ -840,7 +849,7 @@ sap.ui.define([
 	 * @private
 	 */
 	DateTimePicker.prototype._getTranslatedTimezone = function(bUseDefaultAsFallback) {
-		return LocaleData.getInstance(Core.getConfiguration().getFormatSettings().getFormatLocale()).getTimezoneTranslations()[this._getTimezone(bUseDefaultAsFallback)];
+		return LocaleData.getInstance(new Locale(Formatting.getLanguageTag())).getTimezoneTranslations()[this._getTimezone(bUseDefaultAsFallback)];
 	};
 
 	DateTimePicker.prototype._checkStyle = function(sPattern){
@@ -925,7 +934,7 @@ sap.ui.define([
 
 	DateTimePicker.prototype._getLocaleBasedPattern = function(sPlaceholder) {
 		var oLocaleData = LocaleData.getInstance(
-				Core.getConfiguration().getFormatSettings().getFormatLocale()
+				new Locale(Formatting.getLanguageTag())
 			),
 			iSlashIndex = sPlaceholder.indexOf("/");
 
@@ -942,7 +951,7 @@ sap.ui.define([
 		var sLabelId, sLabel, oResourceBundle, sOKButtonText, sCancelButtonText, oPopover;
 
 		if (!this._oPopup) {
-			oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+			oResourceBundle = Library.getResourceBundleFor("sap.m");
 			sOKButtonText = oResourceBundle.getText("TIMEPICKER_SET");
 			sCancelButtonText = oResourceBundle.getText("TIMEPICKER_CANCEL");
 
@@ -1071,15 +1080,15 @@ sap.ui.define([
 				oDate = UI5Date.getInstance();
 				this._oCalendar.removeAllSelectedDates();
 			}
-
-			if (oDate.getTime() < this._oMinDate.getTime()) {
-				oDate = this._oMinDate;
-			} else if (oDate.getTime() > this._oMaxDate.getTime()) {
-				oDate = this._oMaxDate;
-			}
 			this._oOKButton.setEnabled(false);
 		}
 
+		if (oDate.getTime() < this._oMinDate.getTime()) {
+			oDate = this._oMinDate;
+		} else if (oDate.getTime() > this._oMaxDate.getTime()) {
+			oDate = this._oMaxDate;
+		}
+
 		// convert the date to local date for the calendar and the clocks if binding is used
 		if (this._isTimezoneBinding()) {
 			sFormattedDate = this._getPickerParser().format(oDate, this._getTimezone(true));
@@ -1144,7 +1153,7 @@ sap.ui.define([
 
 	DateTimePicker.prototype.getLocaleId = function(){
 
-		return Core.getConfiguration().getFormatSettings().getFormatLocale().toString();
+		return new Locale(Formatting.getLanguageTag()).toString();
 
 	};
 
@@ -1155,7 +1164,7 @@ sap.ui.define([
 	 */
 	DateTimePicker.prototype.getAccessibilityInfo = function() {
 		var oInfo = DatePicker.prototype.getAccessibilityInfo.apply(this, arguments);
-		oInfo.type = Core.getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_DATETIMEINPUT");
+		oInfo.type = Library.getResourceBundleFor("sap.m").getText("ACC_CTR_TYPE_DATETIMEINPUT");
 		return oInfo;
 	};
 
@@ -1228,7 +1237,7 @@ sap.ui.define([
 		}
 
 		if (sDisplayFormat == DateTimeFormatStyles.Short || sDisplayFormat == DateTimeFormatStyles.Medium || sDisplayFormat == DateTimeFormatStyles.Long || sDisplayFormat == DateTimeFormatStyles.Full) {
-			var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale();
+			var oLocale = new Locale(Formatting.getLanguageTag());
 			var oLocaleData = LocaleData.getInstance(oLocale);
 			sTimePattern = oLocaleData.getTimePattern(sDisplayFormat);
 		} else {

package/src/sap/m/DateTimePickerRenderer.js

@@ -4,6 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
+	"sap/ui/core/Lib",
 	'sap/ui/core/Renderer',
 	'./DatePickerRenderer',
 	'./DateTimeFieldRenderer',
@@ -11,12 +12,13 @@ sap.ui.define([
 	'sap/ui/core/date/UI5Date'
 ],
 	function(
+		Library,
 		Renderer,
 		DatePickerRenderer,
 		DateTimeFieldRenderer,
 		coreLibrary,
 		UI5Date
-) {
+	) {
 	"use strict";
 
 	/**
@@ -38,7 +40,7 @@ sap.ui.define([
 	DateTimePickerRenderer.getDescribedByAnnouncement = function(oDP) {
 
 		var sBaseAnnouncement = DateTimeFieldRenderer.getDescribedByAnnouncement.apply(this, arguments);
-		return sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("DATETIMEPICKER_TYPE") + " " + sBaseAnnouncement;
+		return Library.getResourceBundleFor("sap.m").getText("DATETIMEPICKER_TYPE") + " " + sBaseAnnouncement;
 
 	};
 

package/src/sap/m/Dialog.js

@@ -6,6 +6,7 @@
 
 // Provides control sap.m.Dialog.
 sap.ui.define([
+	"sap/ui/core/AnimationMode",
 	"sap/ui/core/ControlBehavior",
 	"sap/base/i18n/Localization",
 	"sap/ui/core/Lib",
@@ -33,13 +34,13 @@ sap.ui.define([
 	"./DialogRenderer",
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/core/Core",
 	"sap/ui/core/Configuration",
 	"sap/ui/dom/units/Rem",
 	// jQuery Plugin "firstFocusableDomRef", "lastFocusableDomRef"
 	"sap/ui/dom/jquery/Focusable"
 ],
 function(
+	AnimationMode,
 	ControlBehavior,
 	Localization,
 	Library,
@@ -67,7 +68,6 @@ function(
 	DialogRenderer,
 	Log,
 	jQuery,
-	Core,
 	Configuration,
 	Rem
 ) {
@@ -95,7 +95,7 @@ function(
 		var TitleAlignment = library.TitleAlignment;
 
 		var sAnimationMode = ControlBehavior.getAnimationMode();
-		var bUseAnimations = sAnimationMode !== Configuration.AnimationMode.none && sAnimationMode !== Configuration.AnimationMode.minimal;
+		var bUseAnimations = sAnimationMode !== AnimationMode.none && sAnimationMode !== AnimationMode.minimal;
 
 		// the time should be longer the longest transition in the CSS (200ms),
 		// because of focusing and transition related issues,
@@ -173,7 +173,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.120.7
+		* @version 1.121.0
 		*
 		* @constructor
 		* @public
@@ -497,6 +497,12 @@ function(
 			return this._headerTitle ? this._headerTitle.getId() : false;
 		});
 
+		/**
+		 * @type {boolean}
+		 * @private
+		 * @deprecated As of version 1.119, getCompatibilityVersion is deprecated.
+		 *    Consumers should behave as if 'edge' was configured
+		 */
 		Dialog._bPaddingByDefault = (Configuration.getCompatibilityVersion("sapMDialogWithPadding").compareTo("1.16") < 0);
 
 		Dialog._initIcons = function () {
@@ -1200,7 +1206,6 @@ function(
 		Dialog.prototype._setDimensions = function () {
 			var $this = this.$(),
 				bStretch = this.getStretch(),
-				bStretchOnPhone = this.getStretchOnPhone() && Device.system.phone,
 				bMessageType = this.getType() === DialogType.Message,
 				oStyles = {};
 
@@ -1225,7 +1230,14 @@ function(
 				oStyles.height = undefined;
 			}
 
-			if ((bStretch && !bMessageType) || (bStretchOnPhone)) {
+			if (bStretch && !bMessageType) {
+				this.$().addClass('sapMDialogStretched');
+			}
+
+			/**
+			 * @deprecated As of version 1.11.2
+			 */
+			if (this.getStretchOnPhone() && Device.system.phone) {
 				this.$().addClass('sapMDialogStretched');
 			}
 
@@ -1582,7 +1594,7 @@ function(
 				oControl;
 
 			if (oFocusDomRef && oFocusDomRef.id) {
-				oControl = Core.byId(oFocusDomRef.id);
+				oControl = Element.getElementById(oFocusDomRef.id);
 			}
 
 			if (oControl) {
@@ -1909,7 +1921,7 @@ function(
 
 		Dialog.prototype.setLeftButton = function (vButton) {
 			if (typeof vButton === "string") {
-				vButton = Core.byId(vButton);
+				vButton = Element.getElementById(vButton);
 			}
 
 			//setting leftButton will also set the beginButton with the same button instance.
@@ -1920,7 +1932,7 @@ function(
 
 		Dialog.prototype.setRightButton = function (vButton) {
 			if (typeof vButton === "string") {
-				vButton = Core.byId(vButton);
+				vButton = Element.getElementById(vButton);
 			}
 
 			//setting rightButton will also set the endButton with the same button instance.