@openui5/sap.m 1.92.0 → 1.93.3

package/src/sap/m/ListBase.js

@@ -71,6 +71,8 @@ function(
 	// shortcut for sap.m.Sticky
 	var Sticky = library.Sticky;
 
+	// shortcut for sap.m.MultiSelectMode
+	var MultiSelectMode = library.MultiSelectMode;
 
 	/**
 	 * Constructor for a new ListBase.
@@ -88,7 +90,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @constructor
 	 * @public
@@ -243,7 +245,24 @@ function(
 			 *
 			 * @since 1.58
 			 */
-			sticky : {type : "sap.m.Sticky[]", group : "Appearance"}
+			sticky : {type : "sap.m.Sticky[]", group : "Appearance"},
+
+			/**
+			 * Defines the multi-selection mode for the control.
+			 * If this property is set to the <code>Default</code> value, the <code>sap.m.Table</code> control renders
+			 * the Select All checkbox in the column header, otherwise the Deselect All icon is rendered.
+			 * The Select All checkbox allows the user to select all the items in the control, and
+			 * the Deselect All icon deselects the items.
+			 * If the property is set to <code>ClearAll</code>, then selecting items via the <code>selectAll</code> method is not possible. See {@link #selectAll selectAll} for more details.
+			 *
+			 * <b>Note:</b> This property must be used with the <code>MultiSelect</code> mode.
+			 * If this property is set to <code>ClearAll</code>, then a selection of multiple items is still possible
+			 * via the range selection feature except <i>CTRL + A</i>.
+			 * Additionally, the <i>CTRL + SHIFT + A</i> key combination can be used for deselecting all the items.
+			 * For details on the range selection, please see {@link topic:8a0d4efa29d44ef39219c18d832012da Keyboard Handling for Item Selection}.
+			 * @since 1.93
+			 */
+			 multiSelectMode : {type: "sap.m.MultiSelectMode", group: "Behavior", defaultValue: MultiSelectMode.Default}
 		},
 		defaultAggregation : "items",
 		aggregations : {
@@ -524,11 +543,11 @@ function(
 	// announce accessibility details at the initial focus
 	ListBase.prototype.bAnnounceDetails = true;
 
-	// determines whether range selection and select all feature should be enabled for MultiSelect mode
-	ListBase.prototype.bPreventMassSelection = false;
-
 	ListBase.getInvisibleText = function() {
-		return this.oInvisibleText || (this.oInvisibleText = new InvisibleText().toStatic());
+		if (!this.oInvisibleText) {
+			this.oInvisibleText = new InvisibleText().toStatic();
+		}
+		return this.oInvisibleText;
 	};
 
 	// class name for the navigation items
@@ -959,9 +978,10 @@ function(
 
 
 	/**
-	 * Select all items in "MultiSelection" mode.
+	 * Selects all items in the <code>MultiSelection</code> mode.
 	 *
-	 * <b>Note:</b> In case <code>growing</code> is enabled, only the visible items in the list will be selected.
+	 * <b>Note:</b> If <code>growing</code> is enabled, only the visible items in the list are selected.
+	 * Since version 1.93, the items are not selected if <code>getMultiSelectMode=ClearAll</code>.
 	 *
 	 * @type this
 	 * @public
@@ -969,7 +989,7 @@ function(
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	ListBase.prototype.selectAll = function (bFireEvent) {
-		if (this.getMode() != "MultiSelect") {
+		if (this.getMode() != "MultiSelect" || this.getMultiSelectMode() == MultiSelectMode.ClearAll) {
 			return this;
 		}
 
@@ -1030,7 +1050,6 @@ function(
 		return this.setProperty("mode", sMode);
 	};
 
-
 	/**
 	 * Returns growing information as object with "actual" and "total" keys.
 	 * Note: This function returns "null" if "growing" feature is disabled.
@@ -1430,7 +1449,7 @@ function(
 	ListBase.prototype.onItemSelect = function(oListItem, bSelected) {
 		var sMode = this.getMode();
 
-		if (this._mRangeSelection && !this.bPreventMassSelection) {
+		if (this._mRangeSelection) {
 			// if this._mRangeSelection.selected == false, then simply select the item
 			if (!this._mRangeSelection.selected) {
 				this._fireSelectionChangeEvent([oListItem]);
@@ -1543,7 +1562,6 @@ function(
 			oEvent.metaKey ||
 			this.getMode() !== ListMode.MultiSelect ||
 			!oItem.isSelectable() ||
-			this.bPreventMassSelection ||
 			oEvent.which === KeyCodes.F6) {
 			if (this._mRangeSelection) {
 				this._mRangeSelection = null;
@@ -1623,12 +1641,13 @@ function(
 	};
 
 	ListBase.prototype._getSwipeContainer = function() {
-		return this._$swipeContainer || (
+		if (!this._$swipeContainer) {
 			this._$swipeContainer = jQuery("<div>", {
 				"id" : this.getId("swp"),
 				"class" : "sapMListSwp"
-			})
-		);
+			});
+		}
+		return this._$swipeContainer;
 	};
 
 	ListBase.prototype._setSwipePosition = function() {
@@ -2294,13 +2313,22 @@ function(
 	// Ctrl + A to switch select all/none
 	ListBase.prototype.onkeydown = function(oEvent) {
 		var bCtrlA = (oEvent.which == KeyCodes.A) && (oEvent.metaKey || oEvent.ctrlKey);
-		if (oEvent.isMarked() || !bCtrlA || !jQuery(oEvent.target).hasClass(this.sNavItemClass) || this.bPreventMassSelection) {
+
+		if (oEvent.isMarked() || !bCtrlA || !jQuery(oEvent.target).hasClass(this.sNavItemClass) ) {
+			return;
+		}
+		var sMultiSelectMode = this.getMultiSelectMode();
+		var bCtrlShiftA = bCtrlA && oEvent.shiftKey && sMultiSelectMode == MultiSelectMode.ClearAll;
+		if (bCtrlShiftA) {
+			oEvent.preventDefault();
+			oEvent.setMarked();
+			this.removeSelections(false, true);
 			return;
 		}
 
 		oEvent.preventDefault();
 
-		if (this.getMode() !== ListMode.MultiSelect) {
+		if (this.getMode() !== ListMode.MultiSelect || sMultiSelectMode ===  MultiSelectMode.ClearAll) {
 			return;
 		}
 
@@ -2434,7 +2462,7 @@ function(
 	};
 
 	ListBase.prototype.onItemUpDownModifiers = function(oItem, oEvent, iDirection) {
-		if (!this._mRangeSelection || this.bPreventMassSelection) {
+		if (!this._mRangeSelection) {
 			return;
 		}
 
@@ -2510,7 +2538,8 @@ function(
 	ListBase.prototype.getStickyStyleValue = function() {
 		var aSticky = this.getSticky();
 		if (!aSticky || !aSticky.length) {
-			return (this._iStickyValue = 0);
+			this._iStickyValue = 0;
+			return this._iStickyValue;
 		}
 
 		var iStickyValue = 0,
@@ -2537,7 +2566,8 @@ function(
 			}
 		});
 
-		return (this._iStickyValue = iStickyValue);
+		this._iStickyValue = iStickyValue;
+		return this._iStickyValue;
 	};
 
 	// gets the sticky header position and scrolls the page so that the item is completely visible when focused

package/src/sap/m/ListItemBase.js

@@ -76,7 +76,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @constructor
 	 * @public
@@ -754,7 +754,7 @@ function(
 	 * By default, when item should be in selectable mode
 	 *
 	 * Subclasses can overwrite in case of unselectable item.
-	 * @returns {Boolean}
+	 * @returns {boolean}
 	 * @private
 	 */
 	ListItemBase.prototype.isSelectable = function() {
@@ -773,10 +773,11 @@ function(
 	 * Returns the state of the item selection as a boolean
 	 *
 	 * @public
-	 * @return boolean
+	 * @returns {boolean}
 	 * @deprecated Since version 1.10.2.
-	 * API Change makes this method unnecessary. Use getSelected method instead.
+	 * API Change makes this method unnecessary. Use the {@link #getSelected} method instead.
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
+	 * @function
 	 */
 	ListItemBase.prototype.isSelected = ListItemBase.prototype.getSelected;
 
@@ -833,7 +834,7 @@ function(
 	/**
 	 * Determines whether group header item or not.
 	 *
-	 * @return {Boolean}
+	 * @return {boolean}
 	 */
 	ListItemBase.prototype.isGroupHeader = function() {
 		return this._bGroupHeader;
@@ -843,7 +844,7 @@ function(
 	 * Determines whether item is in SingleSelectMaster mode or
 	 * other selection modes when includeItemInSelection is true
 	 *
-	 * @return {Boolean}
+	 * @return {boolean}
 	 */
 	ListItemBase.prototype.isIncludedIntoSelection = function() {
 		if (!this.isSelectable()) {
@@ -886,7 +887,7 @@ function(
 	/**
 	 * Determines whether item needs icon to render type or not
 	 *
-	 * @return {Boolean}
+	 * @return {boolean}
 	 */
 	ListItemBase.prototype.hasActiveType = function() {
 		var sType = this.getType();

package/src/sap/m/MaskEnabler.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Applies mask support for input controls.
 	 * It should should be applied to the prototype of a <code>sap.m.InputBase</code>.
 	 *
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @private
 	 * @mixin
 	 * @alias sap.m.MaskEnabler

package/src/sap/m/MaskInput.js

@@ -21,7 +21,7 @@ sap.ui.define(['./InputBase', './MaskEnabler', './MaskInputRenderer'], function(
 	 *
 	 * @author SAP SE
 	 * @extends sap.m.InputBase
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MaskInputRule.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log"], function(Element, Log) {
 	 *
 	 * @author SAP SE
 	 * @extends sap.ui.core.Element
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @public
 	 * @constructor
 	 * @since 1.34.0

package/src/sap/m/Menu.js

@@ -66,7 +66,7 @@ sap.ui.define([
 		 * @implements sap.ui.core.IContextMenu
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MenuButton.js

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @constructor
 		 * @public
@@ -445,8 +445,8 @@ sap.ui.define([
 				case Dock.EndBottom:
 					aParam.push(Dock.EndTop, Dock.EndBottom, oOffset.minus2_right);
 					break;
-				default:
 				case Dock.BeginBottom:
+				default:
 					aParam.push(Dock.BeginTop, Dock.BeginBottom, oOffset.minus2_right);
 					break;
 			}

package/src/sap/m/MenuItem.js

@@ -23,7 +23,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserv
 		 * @extends sap.ui.core.Item
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MenuListItem.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/MessageBox.js

@@ -534,6 +534,11 @@ sap.ui.define([
 				 * @param {object} [mOptions] Other options (optional)
 				 * @param {function} [mOptions.onClose] callback function to be called when the user closes the dialog
 				 * @param {string} [mOptions.title='Alert'] Title to be displayed in the alert dialog
+				 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
+				 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
+				 *      Custom action(s) string or an array can be provided, and then the translation
+				 *      of custom actions needs to be done by the application.
+				 * @param {sap.m.MessageBox.Action|string} [mOptions.emphasizedAction=sap.m.MessageBox.Action.OK] Added since version 1.75.0. Specifies which action of the created dialog will be emphasized. EmphasizedAction will apply only if the property <code>actions</code> is provided.
 				 * @param {string} [mOptions.id] ID to be used for the alert dialog. Intended for test scenarios, not recommended for productive apps
 				 * @param {string} [mOptions.styleClass] Added since version 1.21.2. CSS style class which is added to the alert dialog's root DOM node. The compact design can be activated by setting this to "sapUiSizeCompact"
 				 * @param {string|sap.m.MessageBox.Action} [mOptions.initialFocus] Added since version 1.28.0. initialFocus, this option sets the action name, the text of the button or the control that gets the focus as first focusable element after the MessageBox is opened.
@@ -615,6 +620,11 @@ sap.ui.define([
 				 * @param {object} [mOptions] Other options (optional)
 				 * @param {function} [mOptions.onClose] Callback to be called when the user closes the dialog
 				 * @param {string} [mOptions.title='Confirmation'] Title to display in the confirmation dialog
+				 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
+				 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
+				 *      Custom action(s) string or an array can be provided, and then the translation
+				 *      of custom actions needs to be done by the application.
+				 * @param {sap.m.MessageBox.Action|string} [mOptions.emphasizedAction=sap.m.MessageBox.Action.OK] Added since version 1.75.0. Specifies which action of the created dialog will be emphasized. EmphasizedAction will apply only if the property <code>actions</code> is provided.
 				 * @param {string} [mOptions.id] ID to be used for the confirmation dialog. Intended for test scenarios, not recommended for productive apps
 				 * @param {string} [mOptions.styleClass] Added since version 1.21.2. CSS style class which is added to the confirmation dialog's root DOM node. The compact design can be activated by setting this to "sapUiSizeCompact"
 				 * @param {string|sap.m.MessageBox.Action} [mOptions.initialFocus] Added since version 1.28.0. initialFocus, this option sets the action name, the text of the button or the control that gets the focus as first focusable element after the MessageBox is opened.
@@ -691,6 +701,11 @@ sap.ui.define([
 				 * @param {object} [mOptions] Other options (optional)
 				 * @param {function} [mOptions.onClose] Callback when the user closes the dialog
 				 * @param {string} [mOptions.title='Error'] Title of the error dialog
+				 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
+				 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
+				 *      Custom action(s) string or an array can be provided, and then the translation
+				 *      of custom actions needs to be done by the application.
+				 * @param {sap.m.MessageBox.Action|string} [mOptions.emphasizedAction=sap.m.MessageBox.Action.OK] Added since version 1.75.0. Specifies which action of the created dialog will be emphasized. EmphasizedAction will apply only if the property <code>actions</code> is provided.
 				 * @param {string} [mOptions.id] ID for the error dialog. Intended for test scenarios, not recommended for productive apps
 				 * @param {string} [mOptions.styleClass] CSS style class which is added to the error dialog's root DOM node. The compact design can be activated by setting this to "sapUiSizeCompact"
 				 * @param {string|sap.m.MessageBox.Action} [mOptions.initialFocus] This option sets the action name, the text of the button or the control that gets the focus as first focusable element after the MessageBox is opened.
@@ -752,6 +767,11 @@ sap.ui.define([
 				 * @param {object} [mOptions] Other options (optional)
 				 * @param {function} [mOptions.onClose] Callback when the user closes the dialog
 				 * @param {string} [mOptions.title='Information'] Title of the information dialog
+				 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
+				 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
+				 *      Custom action(s) string or an array can be provided, and then the translation
+				 *      of custom actions needs to be done by the application.
+				 * @param {sap.m.MessageBox.Action|string} [mOptions.emphasizedAction=sap.m.MessageBox.Action.OK] Added since version 1.75.0. Specifies which action of the created dialog will be emphasized. EmphasizedAction will apply only if the property <code>actions</code> is provided.
 				 * @param {string} [mOptions.id] ID for the information dialog. Intended for test scenarios, not recommended for productive apps
 				 * @param {string} [mOptions.styleClass] CSS style class which is added to the information dialog's root DOM node. The compact design can be activated by setting this to "sapUiSizeCompact"
 				 * @param {string|sap.m.MessageBox.Action} [mOptions.initialFocus] This option sets the action name, the text of the button or the control that gets the focus as first focusable element after the MessageBox is opened.
@@ -813,6 +833,11 @@ sap.ui.define([
 				 * @param {object} [mOptions] Other options (optional)
 				 * @param {function} [mOptions.onClose] Callback when the user closes the dialog
 				 * @param {string} [mOptions.title='Warning'] Title of the warning dialog
+				 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
+				 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
+				 *      Custom action(s) string or an array can be provided, and then the translation
+				 *      of custom actions needs to be done by the application.
+				 * @param {sap.m.MessageBox.Action|string} [mOptions.emphasizedAction=sap.m.MessageBox.Action.OK] Added since version 1.75.0. Specifies which action of the created dialog will be emphasized. EmphasizedAction will apply only if the property <code>actions</code> is provided.
 				 * @param {string} [mOptions.id] ID to for the warning dialog. Intended for test scenarios, not recommended for productive apps
 				 * @param {string} [mOptions.styleClass] CSS style class which is added to the warning dialog's root DOM node. The compact design can be activated by setting this to "sapUiSizeCompact"
 				 * @param {string|sap.m.MessageBox.Action} [mOptions.initialFocus] This option sets the action name, the text of the button or the control that gets the focus as first focusable element after the MessageBox is opened.
@@ -874,6 +899,11 @@ sap.ui.define([
 				 * @param {object} [mOptions] Other options (optional)
 				 * @param {function} [mOptions.onClose] Callback when the user closes the dialog
 				 * @param {string} [mOptions.title='Success'] Title of the success dialog
+				 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
+				 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
+				 *      Custom action(s) string or an array can be provided, and then the translation
+				 *      of custom actions needs to be done by the application.
+				 * @param {sap.m.MessageBox.Action|string} [mOptions.emphasizedAction=sap.m.MessageBox.Action.OK] Added since version 1.75.0. Specifies which action of the created dialog will be emphasized. EmphasizedAction will apply only if the property <code>actions</code> is provided.
 				 * @param {string} [mOptions.id] ID for the success dialog. Intended for test scenarios, not recommended for productive apps
 				 * @param {string} [mOptions.styleClass] CSS style class which is added to the success dialog's root DOM node. The compact design can be activated by setting this to "sapUiSizeCompact"
 				 * @param {string|sap.m.MessageBox.Action} [mOptions.initialFocus] This option sets the action name, the text of the button or the control that gets the focus as first focusable element after the MessageBox is opened.

package/src/sap/m/MessageItem.js

@@ -37,7 +37,7 @@ sap.ui.define([
 		 *
 		 * @extends sap.ui.core.Item
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @constructor
 		 * @public
@@ -146,21 +146,6 @@ sap.ui.define([
 			this._updatePropertiesFn = customFn;
 		};
 
-		MessageItem.prototype.setDescription = function(sDescription) {
-			// Avoid showing result of '' + undefined
-			if (typeof sDescription === 'undefined') {
-				sDescription = '';
-			}
-
-			if (this.getMarkupDescription()) {
-				sDescription = sanitizeHTML(sDescription);
-			}
-
-			this.setProperty("description", sDescription, true);
-
-			return this;
-		};
-
 		/**
 		 * Sets type of the MessageItem.
 		 * <b>Note:</b> if you set the type to None it will be handled and rendered as Information.

package/src/sap/m/MessageListItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 		 * @extends sap.m.StandardListItem
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/MessagePage.js

@@ -69,7 +69,7 @@ sap.ui.define([
 		 * @see {@link fiori:https://experience.sap.com/fiori-design-web/message-page/ Message Page}
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessagePopover.js

@@ -91,7 +91,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @constructor
 		 * @public
@@ -465,9 +465,6 @@ function(
 					// update the MessageView's items as well
 					item._updateProperties(function () {
 						that._bItemsChanged = true;
-
-						// navigate back if a property is changed
-						that.navigateBack();
 					});
 
 					// we need to clone the item along with its bindings and aggregations

package/src/sap/m/MessagePopoverItem.js

@@ -19,7 +19,7 @@ sap.ui.define(["./library", "./MessageItem"],
 		 * @extends sap.m.MessageItem
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessageStrip.js

@@ -83,7 +83,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MessageStripUtilities.js

@@ -4,7 +4,11 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
 */
 
-sap.ui.define(function () {
+sap.ui.define([
+	'sap/ui/core/IconPool'
+], function (
+	IconPool
+) {
 	"use strict";
 
 	/**
@@ -43,7 +47,16 @@ sap.ui.define(function () {
 	MessageStripUtilities.getIconURI = function () {
 		var sType = this.getType(),
 			sCustomIconURI = this.getCustomIcon(),
-			sIconURI = "sap-icon://message-" + sType.toLowerCase();
+			sIconURI;
+
+		var oIconsMapping = {
+			"Error": "error",
+			"Warning": "alert",
+			"Success": "sys-enter-2",
+			"Information": "information"
+		};
+
+		sIconURI = IconPool.getIconURI(oIconsMapping[sType]);
 
 		return sCustomIconURI || sIconURI;
 	};

package/src/sap/m/MessageToast.js

@@ -70,7 +70,7 @@ sap.ui.define([
 		 * The message toast has the same behavior on all devices. However, you can adjust the width of the control, for example, for use on a desktop device.
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @namespace
 		 * @public
@@ -357,7 +357,7 @@ sap.ui.define([
 		 * @param {sap.ui.core.CSSSize} [mOptions.width='15em'] The width of the message toast, this value can be provided in %, em, px and all possible CSS measures.
 		 * @param {sap.ui.core.Popup.Dock} [mOptions.my='center bottom'] Specifies which point of the message toast should be aligned (e.g. <code>Dock.LeftTop</code> To use as align point the left top corner of the message toast).
 		 * @param {sap.ui.core.Popup.Dock} [mOptions.at='center bottom'] Specifies the point of the reference element to which the message toast should be aligned (e.g. <code>Dock.RightBottom</code> To position the message toast according to the bottom right corner of the reference element).
-		 * @param {sap.ui.core.Control|Element|jQuery|Window|undefined} [mOptions.of=window] Specifies the reference element to which the message toast should be aligned, by default it is aligned to the browser visual viewport.
+		 * @param {sap.ui.core.Control|Element|jQuery|Window} [mOptions.of=window] Specifies the reference element to which the message toast should be aligned, by default it is aligned to the browser visual viewport.
 		 * @param {string} [mOptions.offset='0 0'] The offset relative to the docking point, specified as a string with space-separated pixel values (e.g. "10 5" to move the message toast 10 pixels to the right and 5 pixels to the bottom).
 		 * @param {string} [mOptions.collision='fit fit'] Specifies how the position of the message toast should be adjusted in case it overflows the screen in some direction. Possible values “fit”, “flip”, “none”, or a pair for horizontal and vertical e.g. "fit flip”, "fit none".
 		 * @param {function} [mOptions.onClose=null] Function to be called when the message toast closes.

package/src/sap/m/MessageView.js

@@ -112,7 +112,7 @@ sap.ui.define([
 	 * The responsiveness of the <code>MessageView</code> is determined by the container in which it is embedded. For that reason the control could not be visualized if the
 	 * container’s sizes are not defined.
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @extends sap.ui.core.Control
 	 * @constructor
@@ -248,10 +248,10 @@ sap.ui.define([
 	var ICONS = {
 		back: IconPool.getIconURI("nav-back"),
 		close: IconPool.getIconURI("decline"),
-		information: IconPool.getIconURI("message-information"),
-		warning: IconPool.getIconURI("message-warning"),
-		error: IconPool.getIconURI("message-error"),
-		success: IconPool.getIconURI("message-success")
+		information: IconPool.getIconURI("information"),
+		warning: IconPool.getIconURI("alert"),
+		error: IconPool.getIconURI("error"),
+		success: IconPool.getIconURI("sys-enter-2")
 	};
 
 	var LIST_TYPES = ["all", "error", "warning", "success", "information"];
@@ -667,7 +667,7 @@ sap.ui.define([
 
 		this._detailsPage = new Page(this.getId() + "-detailsPage", {
 			customHeader: this._getDetailsHeader()
-		});
+		}).addStyleClass("sapMMsgViewDetailsPage");
 
 		// TODO: check if this is the best location for this
 		// Disable clicks on disabled and/or pending links
@@ -979,15 +979,22 @@ sap.ui.define([
 	 */
 	MessageView.prototype._setDescription = function (oMessageItem) {
 		var oLink = oMessageItem.getLink();
+		var sDescription = oMessageItem.getDescription();
+
+		if (oMessageItem.getMarkupDescription()) {
+			var tagPolicy = this._getTagPolicy();
+			/*global html*/
+			sDescription = html.sanitizeWithPolicy(sDescription, tagPolicy);
+		}
+
 		this._oLastSelectedItem = oMessageItem;
 		if (oMessageItem.getMarkupDescription()) {
-			// description is sanitized in MessageItem.setDescription()
 			this._oMessageDescriptionText = new HTML(this.getId() + "MarkupDescription", {
-				content: "<div class='sapMMsgViewDescriptionText'>" + ManagedObject.escapeSettingsValue(oMessageItem.getDescription()) + "</div>"
+				content: "<div class='sapMMsgViewDescriptionText'>" + ManagedObject.escapeSettingsValue(sDescription) + "</div>"
 			});
 		} else {
 			this._oMessageDescriptionText = new Text(this.getId() + "MessageDescriptionText", {
-				text: ManagedObject.escapeSettingsValue(oMessageItem.getDescription())
+				text: ManagedObject.escapeSettingsValue(sDescription)
 			}).addStyleClass("sapMMsgViewDescriptionText");
 		}
 
@@ -1159,24 +1166,6 @@ sap.ui.define([
 		};
 	};
 
-	/**
-	 * Perform description sanitization based on Caja HTML sanitizer
-	 * @param {sap.m.MessageItem} oMessageItem The item to be sanitized
-	 * @private
-	 */
-	MessageView.prototype._sanitizeDescription = function (oMessageItem) {
-		var sDescription = oMessageItem.getDescription();
-
-		if (oMessageItem.getMarkupDescription()) {
-			var tagPolicy = this._getTagPolicy();
-			/*global html*/
-			sDescription = html.sanitizeWithPolicy(sDescription, tagPolicy);
-		}
-
-		oMessageItem.setDescription(sDescription);
-		this._setDescription(oMessageItem);
-	};
-
 	/**
 	 * Handles click on a list item
 	 *
@@ -1248,7 +1237,7 @@ sap.ui.define([
 
 	MessageView.prototype._navigateToDetails = function(oMessageItem, oListItem, sTransiotionName, bSuppressNavigate) {
 		this._setTitle(oMessageItem, oListItem);
-		this._sanitizeDescription(oMessageItem);
+		this._setDescription(oMessageItem);
 		this._setIcon(oMessageItem, oListItem);
 		this._detailsPage.invalidate();
 		this.fireLongtextLoaded();