@openui5/sap.ui.unified 1.96.2 → 1.98.0

package/src/sap/ui/unified/CalendarMonthIntervalRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/unified/CalendarOneMonthInterval.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -57,7 +57,7 @@ sap.ui.define([
 		 * Navigation via year picker switches to the corresponding year and the same month as before the navigation.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.96.2
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/unified/CalendarOneMonthIntervalRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/unified/CalendarRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/unified/CalendarRow.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -76,7 +76,7 @@ sap.ui.define([
 	 * @class
 	 * A calendar row with a header and appointments. The Appointments will be placed in the defined interval.
 	 * @extends sap.ui.core.Control
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -223,7 +223,16 @@ sap.ui.define([
 			 * @experimental Since 1.81.0
 			 * @since 1.81.0
 			 */
-			appointmentRoundWidth: { type: "sap.ui.unified.CalendarAppointmentRoundWidth", group: "Appearance", defaultValue: CalendarAppointmentRoundWidth.None}
+			appointmentRoundWidth: { type: "sap.ui.unified.CalendarAppointmentRoundWidth", group: "Appearance", defaultValue: CalendarAppointmentRoundWidth.None},
+
+			/**
+			 * Determines whether the selection of multiple appointments is enabled.
+			 *
+			 * Note: selection of multiple appointments is possible using CTRL key regardless of the value of this property.
+			 *
+			 * @since 1.97
+			 */
+			multipleAppointmentsSelection : {type : "boolean", group : "Data", defaultValue : false}
 		},
 		aggregations : {
 
@@ -590,7 +599,8 @@ sap.ui.define([
 		for (var i = 0; i < aVisibleAppointments.length; i++) {
 			var oAppointment = aVisibleAppointments[i].appointment;
 			if (containsOrEquals(oAppointment.getDomRef(), oEvent.target)) {
-				_selectAppointment.call(this, oAppointment, !(oEvent.ctrlKey || oEvent.metaKey));
+				var bRemoveOldSelection = !(this.getMultipleAppointmentsSelection() || oEvent.ctrlKey || oEvent.metaKey);
+				_selectAppointment.call(this, oAppointment, bRemoveOldSelection);
 				break;
 			}
 		}

package/src/sap/ui/unified/CalendarRowRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -440,7 +440,7 @@ sap.ui.define([
 		oRm.openEnd();
 
 		if (oArrowValues.appTimeUnitsDifRowStart > 0) {
-			oRm.icon("sap-icon://arrow-left", ["sapUiCalendarAppArrowIconLeft"], { title: null });
+			oRm.icon("sap-icon://arrow-left", ["sapUiCalendarAppArrowIconLeft"], { title: null, role: "img" });
 		}
 
 		var sIcon = oIntervalHeader.appointment.getIcon();
@@ -450,6 +450,7 @@ sap.ui.define([
 
 			mAttributes["id"] = sId + "-Icon";
 			mAttributes["title"] = null;
+			mAttributes["role"] = "img";
 			oRm.icon(sIcon, aClasses, mAttributes);
 		}
 
@@ -472,7 +473,7 @@ sap.ui.define([
 		}
 
 		if (oArrowValues.appTimeUnitsDifRowEnd > 0) {
-			oRm.icon("sap-icon://arrow-right",["sapUiCalendarAppArrowIconRight"], { title: null });
+			oRm.icon("sap-icon://arrow-right",["sapUiCalendarAppArrowIconRight"], { title: null, role: "img" });
 		}
 
 		// ARIA information about start and end
@@ -602,13 +603,14 @@ sap.ui.define([
 			});
 		} else {
 			if (oArrowValues.appTimeUnitsDifRowStart > 0) {
-				oRm.icon("sap-icon://arrow-left", ["sapUiCalendarAppArrowIconLeft"], { title: null });
+				oRm.icon("sap-icon://arrow-left", ["sapUiCalendarAppArrowIconLeft"], { title: null, role: "img" });
 			}
 			if (sIcon) {
 				var aClasses = ["sapUiCalendarAppIcon"];
 				var mAttributes = {};
 				mAttributes["id"] = sId + "-Icon";
 				mAttributes["title"] = null;
+				mAttributes["role"] = "img";
 				oRm.icon(sIcon, aClasses, mAttributes);
 			}
 			oRm.openStart("div");
@@ -637,25 +639,27 @@ sap.ui.define([
 			}
 			oRm.close("div");
 			if (oArrowValues.appTimeUnitsDifRowEnd > 0) {
-				oRm.icon("sap-icon://arrow-right", ["sapUiCalendarAppArrowIconRight"], { title: null });
+				oRm.icon("sap-icon://arrow-right", ["sapUiCalendarAppArrowIconRight"], { title: null, role: "img" });
 			}
-			// ARIA information about start and end
-			var sAriaText = oRow._oRb.getText("CALENDAR_START_TIME") + ": " + oRow._oFormatAria.format(oAppointment.getStartDate());
-			sAriaText = sAriaText + "; " + oRow._oRb.getText("CALENDAR_END_TIME") + ": " + oRow._oFormatAria.format(oAppointment.getEndDate());
-			if (oRow._getRelativeInfo && oRow._getRelativeInfo().bIsRelative) {
-				var oRelativeInfo = oRow._getRelativeInfo();
-				sAriaText = oRow._oRb.getText("CALENDAR_START_TIME") + ": " + oRelativeInfo.intervalLabelFormatter(oRelativeInfo._getIndexFromDate(oAppointment.getStartDate()));
-				sAriaText = sAriaText + "; " + oRow._oRb.getText("CALENDAR_END_TIME") + ": " + oRelativeInfo.intervalLabelFormatter(oRelativeInfo._getIndexFromDate(oAppointment.getEndDate()));
-			}
-			if (sType && sType != CalendarDayType.None) {
-				sAriaText = sAriaText + "; " + this.getAriaTextForType(sType, aTypes);
-			}
-			oRm.openStart("span", sId + "-Descr");
-			oRm.class("sapUiInvisibleText");
-			oRm.openEnd();
-			oRm.text(sAriaText);
-			oRm.close("span");
 		}
+
+		// ARIA information about start and end
+		var sAriaText = oRow._oRb.getText("CALENDAR_START_TIME") + ": " + oRow._oFormatAria.format(oAppointment.getStartDate());
+		sAriaText = sAriaText + "; " + oRow._oRb.getText("CALENDAR_END_TIME") + ": " + oRow._oFormatAria.format(oAppointment.getEndDate());
+		if (oRow._getRelativeInfo && oRow._getRelativeInfo().bIsRelative) {
+			var oRelativeInfo = oRow._getRelativeInfo();
+			sAriaText = oRow._oRb.getText("CALENDAR_START_TIME") + ": " + oRelativeInfo.intervalLabelFormatter(oRelativeInfo._getIndexFromDate(oAppointment.getStartDate()));
+			sAriaText = sAriaText + "; " + oRow._oRb.getText("CALENDAR_END_TIME") + ": " + oRelativeInfo.intervalLabelFormatter(oRelativeInfo._getIndexFromDate(oAppointment.getEndDate()));
+		}
+		if (sType && sType != CalendarDayType.None) {
+			sAriaText = sAriaText + "; " + this.getAriaTextForType(sType, aTypes);
+		}
+		oRm.openStart("span", sId + "-Descr");
+		oRm.class("sapUiInvisibleText");
+		oRm.openEnd();
+		oRm.text(sAriaText);
+		oRm.close("span");
+
 		//app content
 		oRm.close("div");
 

package/src/sap/ui/unified/CalendarTimeInterval.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @class
 	 * Calendar with granularity of time items displayed in one line.
 	 * @extends sap.ui.core.Control
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarTimeIntervalRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/unified/CalendarWeekInterval.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -39,7 +39,7 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarUtils', 'sap/ui/unified/calendar
 		 * its start date to the first date of the same week as the date the user chose.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.96.2
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/unified/ColorPicker.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -569,17 +569,23 @@ sap.ui.define([
 		this.bResponsive = Library.ColorPickerHelper.isResponsive();
 
 		// Color picker cursor size in px obtained from less parameter. Keep in mind width and height are the same.
-		var circleSize = this.bResponsive ? "_sap_ui_unified_ColorPicker_CircleSize" : "_sap_ui_commons_ColorPicker_CircleSize";
-		this._iCPCursorSize = parseInt(Parameters.get(circleSize));
+		var sCircleSizeCSSParameterName = this.bResponsive ? "_sap_ui_unified_ColorPicker_CircleSize" : "_sap_ui_unified_ColorPicker_commonsCircleSize";
+		this._iCPCursorSize = 0;
+		var sCircleSizeCSSParameter = Parameters.get({
+			name: sCircleSizeCSSParameterName,
+			callback: function (_mParams) {
+				this._iCPCursorSize = parseInt(_mParams);
+			}.bind(this)
+		});
+
+		if (sCircleSizeCSSParameter) {
+			this._iCPCursorSize = parseInt(sCircleSizeCSSParameter);
+		}
 
 		// Init _processChanges and _bHSLMode according to default control mode
 		this._processChanges = this._processHSVChanges;
 		this._bHSLMode = false;
 
-		if (this.getDisplayMode() === ColorPickerDisplayMode.Simplified) {
-			CONSTANTS.HideForDisplay.value = ".hideDisplay";
-		}
-
 		this.bPressed = false;
 	};
 
@@ -1040,6 +1046,9 @@ sap.ui.define([
 
 		// Create internal controls
 		this._createInteractionControls();
+		if (this.getDisplayMode() === ColorPickerDisplayMode.Large) {
+			this._toggleInputsEnabled(this.Color.formatHSL);
+		}
 
 		// Layout Data - that will be needed for visual state update
 		this.oCPBoxGD = new GridData({span: "L6 M6 S12"}); // Color picker box
@@ -1339,14 +1348,22 @@ sap.ui.define([
 	/**
 	 * Event handler for changes of RGB or HSL radio button field.
 	 */
-	ColorPicker.prototype._handleRGBorHSLValueChange = function() {
-		// store new value
-		var oUnifiedRBGroup = this.oRGBorHSLRBUnifiedGroup;
-		this.Color.formatHSL = oUnifiedRBGroup ? oUnifiedRBGroup.getSelectedIndex() === 1 : this.oRGBorHSLRBGroup.getSelectedIndex() === 1;
-
+	ColorPicker.prototype._handleRGBorHSLValueChange = function(oEvent) {
+		this.Color.formatHSL = oEvent.getParameter("selectedIndex") === 1;
+		this._toggleInputsEnabled(this.Color.formatHSL);
 		this._updateColorStringProperty(true, true);
 	};
 
+	ColorPicker.prototype._toggleInputsEnabled = function(bHSL) {
+		this.oRedField.setEnabled(!bHSL);
+		this.oGreenField.setEnabled(!bHSL);
+		this.oBlueField.setEnabled(!bHSL);
+		this.oHueField.setEnabled(!!bHSL);
+		this.oSatField.setEnabled(!!bHSL);
+		this.oLitField.setEnabled(!!bHSL);
+		this.oValField.setEnabled(!!bHSL);
+	};
+
 	/**
 	 * Event handler for changes of Hue input field.
 	 * @private

package/src/sap/ui/unified/ColorPickerDisplayMode.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/unified/ColorPickerPopover.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -47,7 +47,7 @@ sap.ui.define([
 		 * A thin wrapper over {@link sap.ui.unified.ColorPicker} allowing the latter to be used in a popover.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.96.2
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/unified/ColorPickerRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/unified/ContentSwitcher.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/ContentSwitcherRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/unified/Currency.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.96.2
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/unified/CurrencyRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -14,7 +14,7 @@ sap.ui.define(["sap/m/library", "sap/ui/core/Core"],
 	/**
 	 * Currency renderer.
 	 *
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @namespace
 	 */
 	var CurrencyRenderer = {

package/src/sap/ui/unified/DateRange.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/calendar/Cale
 	 * @class
 	 * Date range for use in DatePicker
 	 * @extends sap.ui.core.Element
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/DateTypeRange.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -25,7 +25,7 @@ sap.ui.define(['./DateRange', './library'],
 	 * @class
 	 * Date range with calendar day type information. Used to visualize special days in the Calendar.
 	 * @extends sap.ui.unified.DateRange
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/FileUploader.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.unified.IProcessableBlobs
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -596,13 +596,6 @@ sap.ui.define([
 		// check if sap.m library is used
 		this.bMobileLib = this.oBrowse.getMetadata().getName() == "sap.m.Button";
 
-		//retrieving the default browse button text from the resource bundle
-		if (!this.getIconOnly()) {
-			this.oBrowse.setText(this.getBrowseText());
-		} else  {
-			this.oBrowse.setTooltip(this.getBrowseText());
-		}
-
 		if (sap.ui.getCore().getConfiguration().getAccessibility()) {
 			if (!FileUploader.prototype._sAccText) {
 				var rb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.unified");
@@ -620,16 +613,6 @@ sap.ui.define([
 
 	};
 
-	FileUploader.prototype.setButtonText = function(sText) {
-		this.setProperty("buttonText", sText, false);
-		if (!this.getIconOnly()) {
-			this.oBrowse.setText(sText || this.getBrowseText());
-		} else  {
-			this.oBrowse.setTooltip(this.getBrowseText());
-		}
-		return this;
-	};
-
 	FileUploader.prototype.setIcon = function(sIcon) {
 		this.oBrowse.setIcon(sIcon);
 		this.setProperty("icon", sIcon, false);
@@ -660,18 +643,6 @@ sap.ui.define([
 		return this;
 	};
 
-	FileUploader.prototype.setIconOnly = function(bIconOnly) {
-		this.setProperty("iconOnly", bIconOnly, false);
-		if (bIconOnly) {
-			this.oBrowse.setText("");
-			this.oBrowse.setTooltip(this.getBrowseText());
-		} else  {
-			this.oBrowse.setText(this.getButtonText() || this.getBrowseText());
-			this.oBrowse.setTooltip("");
-		}
-		return this;
-	};
-
 	FileUploader.prototype.getIdForLabel = function () {
 		return this.oBrowse.getId();
 	};
@@ -736,23 +707,17 @@ sap.ui.define([
 	};
 
 	FileUploader.prototype.setTooltip = function(oTooltip) {
-		var sTooltip,
-			sapUiFupInputMaskDOM;
+		var sTooltip;
 
-		this._refreshTooltipBaseDelegate(oTooltip);
-		this.setAggregation("tooltip", oTooltip, true);
-		this._updateAccDescription();
+		Control.prototype.setTooltip.call(this, oTooltip);
 
 		if (this.oFileUpload) {
 			sTooltip = this.getTooltip_AsString();
-			sapUiFupInputMaskDOM = this.$().find(".sapUiFupInputMask")[0];
 
 			if (sTooltip) {
 				this.oFileUpload.setAttribute("title", sTooltip);
-				sapUiFupInputMaskDOM && sapUiFupInputMaskDOM.setAttribute("title", sTooltip);
 			} else {
 				this.oFileUpload.removeAttribute("title");
-				sapUiFupInputMaskDOM && sapUiFupInputMaskDOM.removeAttribute("title");
 			}
 		}
 		return this;
@@ -844,20 +809,6 @@ sap.ui.define([
 		return sAccDescription;
 	};
 
-	/*
-	 * Updates the hidden element's text, which holds the accessibility description.
-	 * This method should be called whenever the placeholder/value/tooltip update.
-	 * Otherwise screen readers will simply read a description, which doesn't match
-	 * what's visible on the screen.
-	 */
-	FileUploader.prototype._updateAccDescription = function () {
-		var oAccDescriptionHolder = this.getDomRef("AccDescr"),
-			sNewDescription = this._generateAccDescriptionText();
-
-		if (oAccDescriptionHolder) {
-			oAccDescriptionHolder.innerHTML = encodeXML(sNewDescription);
-		}
-	};
 
 	/**
 	 * Helper to ensure, that the types (file or mime) are inside an array.
@@ -929,6 +880,18 @@ sap.ui.define([
 		// unbind the custom event handlers
 		jQuery(this.oFileUpload).off();
 
+		if (this.getIconOnly() && this.getButtonOnly()) {
+			this.oBrowse.setText("");
+			this.oBrowse.setTooltip(this.getTooltip_AsString() || this.getBrowseText());
+		} else if (this.getIconOnly()) {
+			this.oBrowse.setText("");
+			this.oBrowse.setTooltip(this.getBrowseText());
+		} else {
+			this.oBrowse.setText(this.getButtonText() || this.getBrowseText());
+			this.oBrowse.setTooltip("");
+		}
+
+		this.oFilePath.setPlaceholder(this.getPlaceholder());
 	};
 
 	/**
@@ -1105,15 +1068,6 @@ sap.ui.define([
 		return this.setProperty("valueStateText", sValueStateText, true);
 	};
 
-	FileUploader.prototype.setPlaceholder = function(sPlaceholder) {
-		this.setProperty("placeholder", sPlaceholder, true);
-		this.oFilePath.setPlaceholder(sPlaceholder);
-
-		this._updateAccDescription();
-
-		return this;
-	};
-
 	FileUploader.prototype.setStyle = function(sStyle) {
 		this.setProperty("style", sStyle, true);
 		if (sStyle) {

package/src/sap/ui/unified/FileUploaderHttpRequestMethod.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/unified/FileUploaderParameter.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/FileUploaderRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/unified/FileUploaderXHRSettings.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.96.2
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @since 1.52

package/src/sap/ui/unified/Menu.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IContextMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @since 1.21.0
 	 *
 	 * @constructor