@openui5/sap.m 1.107.1 → 1.108.1

package/src/sap/m/SlideTileRenderer.js

@@ -57,8 +57,11 @@ sap.ui.define(['./library', "sap/base/security/encodeCSS"],
 		if (iLength > 1) {
 			oRm.attr("tabindex", "0");
 		}
-		oRm.attr("role", "presentation");
+		oRm.attr("role", "application");
+		oRm.attr("aria-roledescription", oControl._oRb.getText("SLIDETILE"));
 		oRm.openEnd();
+		oControl.getAggregation("_invisibleText");
+		oRm.renderControl(oControl.getAggregation("_invisibleText"));
 		if (iLength > 1 && sScope === GenericTileScope.Display) {
 			this._renderPausePlayIcon(oRm, oControl);
 			this._renderTilesIndicator(oRm, oControl);
@@ -77,6 +80,7 @@ sap.ui.define(['./library', "sap/base/security/encodeCSS"],
 	SlideTileRenderer._renderTiles = function(oRm, oControl, iLength) {
 		oRm.openStart("div");
 		oRm.class("sapMSTOverflowHidden");
+		oRm.attr("aria-hidden","true");
 		oRm.openEnd();
 		for (var i = 0; i < iLength; i++) {
 			oRm.openStart("div", oControl.getId() + "-wrapper-" + i );

package/src/sap/m/Slider.js

@@ -97,7 +97,7 @@ function(
 		 * @implements sap.ui.core.IFormContent
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SliderTooltip.js

@@ -42,7 +42,7 @@ function(
 		 * @extends sap.m.SliderTooltipBase
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SliderTooltipBase.js

@@ -21,7 +21,7 @@ function(Control, Library, SliderTooltipBaseRenderer) {
 		 * @abstract
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SliderTooltipContainer.js

@@ -37,7 +37,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SplitApp.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.m.SplitContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SplitButton.js

@@ -46,7 +46,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SplitContainer.js

@@ -82,7 +82,7 @@ function(
 	 *
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StandardDynamicDateOption.js

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @public
 		 * @alias sap.m.StandardDynamicDateOption

package/src/sap/m/StandardListItem.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StandardTile.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.m.Tile
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StandardTreeItem.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.m.TreeItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StepInput.js

@@ -119,7 +119,7 @@ function(
 		 * @implements sap.ui.core.IFormContent
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @public
@@ -298,11 +298,6 @@ function(
 			renderer: StepInputRenderer
 		});
 
-		// get resource translation bundle;
-		var oLibraryResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
-		StepInput.STEP_INPUT_INCREASE_BTN_TOOLTIP = oLibraryResourceBundle.getText("STEP_INPUT_INCREASE_BTN");
-		StepInput.STEP_INPUT_DECREASE_BTN_TOOLTIP = oLibraryResourceBundle.getText("STEP_INPUT_DECREASE_BTN");
-
 		StepInput.INITIAL_WAIT_TIMEOUT = 500;
 		StepInput.ACCELLERATION = 0.8;
 		StepInput.MIN_WAIT_TIMEOUT = 50;
@@ -347,7 +342,6 @@ function(
 
 			this._getInput().setValue(this._getFormattedValue(vValue));
 			this._getInput().setValueState(this.getValueState());
-			this._getInput().setTooltip(this.getTooltip());
 			this._getOrCreateDecrementButton().setVisible(bEditable);
 			this._getOrCreateIncrementButton().setVisible(bEditable);
 
@@ -511,7 +505,7 @@ function(
 					noTabStop: true,
 					decorative: false,
 					press: this._handleButtonPress.bind(this, 1),
-					tooltip: StepInput.STEP_INPUT_INCREASE_BTN_TOOLTIP
+					useIconTooltip: false
 				});
 
 			oIcon.getEnabled = function () {
@@ -544,7 +538,7 @@ function(
 					noTabStop: true,
 					decorative: false,
 					press: this._handleButtonPress.bind(this, -1),
-					tooltip: StepInput.STEP_INPUT_DECREASE_BTN_TOOLTIP
+					useIconTooltip: false
 				});
 
 			oIcon.getEnabled = function () {

package/src/sap/m/SuggestionItem.js

@@ -22,7 +22,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/core/IconPool'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 * @since 1.34
 	 *
 	 * @constructor

package/src/sap/m/SuggestionsPopover.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @alias sap.m.SuggestionsPopover
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 */
 	var SuggestionsPopover = EventProvider.extend("sap.m.SuggestionsPopover", /** @lends sap.m.SuggestionsPopover.prototype */ {
 

package/src/sap/m/Switch.js

@@ -50,7 +50,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/TabContainer.js

@@ -66,7 +66,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/TabContainerItem.js

@@ -26,7 +26,7 @@ sap.ui.define(['sap/ui/core/Element',
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/TabStrip.js

@@ -73,7 +73,7 @@ function(
 		 * space is exceeded, a horizontal scrollbar appears.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/TabStripItem.js

@@ -25,7 +25,7 @@ sap.ui.define(["./library", "sap/ui/core/Item", "sap/ui/base/ManagedObject", "sa
 		 * @extends sap.ui.core.Item
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/Table.js

@@ -6,6 +6,7 @@
 
 // Provides control sap.m.Table.
 sap.ui.define([
+	"sap/ui/events/KeyCodes",
 	"sap/ui/core/Core",
 	"./library",
 	"./ListBase",
@@ -22,7 +23,7 @@ sap.ui.define([
 	// jQuery custom selectors ":sapTabbable"
 	"sap/ui/dom/jquery/Selectors"
 ],
-	function(Core, library, ListBase, ListItemBase, CheckBox, TableRenderer, BaseObject, ResizeHandler, PasteHelper, jQuery, ListBaseRenderer, Icon, Util) {
+	function(KeyCodes, Core, library, ListBase, ListItemBase, CheckBox, TableRenderer, BaseObject, ResizeHandler, PasteHelper, jQuery, ListBaseRenderer, Icon, Util) {
 	"use strict";
 
 
@@ -64,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public
@@ -357,7 +358,21 @@ sap.ui.define([
 				oNoColumns = Util.getNoColumnsIllustratedMessage();
 				this.setAggregation("_noColumnsMessage", oNoColumns);
 			}
+		} else if (vNoData && (typeof vNoData === "string" || !vNoData.isA("sap.m.IllustratedMessage"))) {
+			// If the given vNoData is not an IllustratedMessage remove the according column message
+			this.removeAllAggregation("_noColumnsMessage");
 		}
+
+		if (!this.shouldRenderItems()) {
+			if (this.getAggregation("_noColumnsMessage")) {
+				// Invalidate table, if there is an illustrated message present, to prevent possible replacement with plain text
+				this.invalidate();
+			} else {
+				// Only set the no columns string, if there is no illustrated message present
+				this.$("nodata-text").text(Core.getLibraryResourceBundle("sap.m").getText("TABLE_NO_COLUMNS"));
+			}
+		}
+
 		return this;
 	};
 
@@ -714,11 +729,13 @@ sap.ui.define([
 	};
 
 	Table.prototype.onColumnPress = function(oColumn) {
-		var oMenu = oColumn.getColumnHeaderMenu();
+		var oMenu = oColumn._getHeaderMenuInstance();
 		oMenu && oMenu.openBy(oColumn);
-		(this.bActiveHeaders || oMenu) && this.fireEvent("columnPress", {
-			column: oColumn
-		});
+		if (this.bActiveHeaders && !oMenu) {
+			this.fireEvent("columnPress", {
+				column: oColumn
+			});
+		}
 	};
 
 	/*
@@ -822,6 +839,38 @@ sap.ui.define([
 		jQuery(this.getTableDomRef()).toggleClass("sapMListTblHasNav", bVisible);
 	};
 
+	Table.prototype.onkeydown = function(oEvent) {
+		// handles the F2 and F7 key on the table header row and column header,
+		// switch focus between the table header row and column header and if F2 is pressed the also switching the keyboardMode
+		var bFocusToggled = false;
+
+		if (oEvent.which === KeyCodes.F2 || oEvent.which === KeyCodes.F7) {
+			var $TblHeader = this.$("tblHeader"),
+				$Tabbables = $TblHeader.find(":sapTabbable");
+
+			if (oEvent.target.classList.contains("sapMColumnHeader")) {
+				this._iLastFocusPosOfColumnHeader = $Tabbables.length && $Tabbables.index(oEvent.target);
+				$TblHeader.trigger("focus");
+				bFocusToggled = true;
+			} else if (oEvent.target === $TblHeader[0]) {
+				var iFocusPos = this._iLastFocusPosOfColumnHeader || 0;
+				iFocusPos = $Tabbables[iFocusPos] ? iFocusPos : -1;
+				$Tabbables.eq(iFocusPos).trigger("focus");
+				bFocusToggled = true;
+			}
+
+			if (bFocusToggled) {
+				oEvent.preventDefault();
+				oEvent.setMarked();
+				if (oEvent.which === KeyCodes.F2) {
+					this.setKeyboardMode(this.getKeyboardMode() === "Edit" ? "Navigation" : "Edit");
+				}
+			}
+		}
+
+		ListBase.prototype.onkeydown.apply(this, arguments);
+	};
+
 	// notify all columns with given action and param
 	Table.prototype._notifyColumns = function(sAction, vParam1, vParam2) {
 		this.getColumns().forEach(function(oColumn) {
@@ -1002,7 +1051,7 @@ sap.ui.define([
 
 			var oHeader = oColumn.getHeader();
 			if (oHeader && oHeader.getVisible()) {
-				sAnnouncement += ListItemBase.getAccessibilityText(oHeader) + " . ";
+				sAnnouncement += ListItemBase.getAccessibilityText(oHeader, false /* bDetectEmpty */, true /* bHeaderAnnouncement */) + " . ";
 			}
 		});
 
@@ -1293,8 +1342,8 @@ sap.ui.define([
 			return sType === "Detail" || sType === "DetailAndActive" || sType === "Navigation";
 		}) ? iThemeDensityWidth : 0;
 
-		// Inset + HighlightCol + NavigatedIndicatorCol + borders = ~0.65rem
-		return iInset + iSelectionWidth + iActionWidth + 0.65;
+		// borders = ~0.25rem
+		return iInset + iSelectionWidth + iActionWidth + 0.25;
 	};
 
 	/**
@@ -1315,7 +1364,7 @@ sap.ui.define([
 			// check for column width unit
 			if (sUnit === "px") {
 				// column has a fixed width -> convert column width from px into float rem value
-				fAccumulatedWidth += parseFloat((parseFloat(sWidth).toFixed(2) / sBaseFontSize).toFixed(2));
+				fAccumulatedWidth += parseFloat(sWidth) / sBaseFontSize;
 			} else if (sUnit === "em" || sUnit === "rem") {
 				// column has a fixed width -> convert to float in any case to get only the column width value
 				fAccumulatedWidth += parseFloat(sWidth);
@@ -1325,7 +1374,7 @@ sap.ui.define([
 			}
 
 			oColumn.setDemandPopin(oColumn !== oMostImportantColumn);
-			oColumn.setMinScreenWidth(oColumn !== oMostImportantColumn ? fAccumulatedWidth + "rem" : "");
+			oColumn.setMinScreenWidth(oColumn !== oMostImportantColumn ? parseFloat(fAccumulatedWidth).toFixed(2) + "rem" : "");
 		});
 
 		return fAccumulatedWidth;

package/src/sap/m/TablePersoController.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @class Table Personalization Controller
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 * @alias sap.m.TablePersoController
 	 */
 	var TablePersoController = ManagedObject.extend("sap.m.TablePersoController", /** @lends sap.m.TablePersoController.prototype */

package/src/sap/m/TablePersoDialog.js

@@ -85,7 +85,7 @@ sap.ui.define([
 	 * @class Table Personalization Dialog
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 * @alias sap.m.TablePersoDialog
 	 */
 	var TablePersoDialog = ManagedObject.extend("sap.m.TablePersoDialog", /** @lends sap.m.TablePersoDialog.prototype */

package/src/sap/m/TablePersoProvider.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/base/ManagedObject', "sap/base/Log"],
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 * @alias sap.m.TablePersoProvider
 	 */
 	var TablePersoProvider = ManagedObject.extend("sap.m.TablePersoProvider", /** @lends sap.m.TablePersoProvider.prototype */

package/src/sap/m/TableRenderer.js

@@ -208,16 +208,19 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 
 			if (control) {
 				if (type === "Head") {
-					rm.openStart("div");
+					rm.openStart("div", oColumn.getId() + "-ah");
 					rm.class("sapMColumnHeader");
 
-					var oMenu = oColumn.getColumnHeaderMenu();
+					var oMenu = oColumn._getHeaderMenuInstance();
 					if ((oTable.bActiveHeaders || oMenu)  && !control.isA("sap.ui.core.InvisibleText")) {
 						// add active header attributes and style class
 						rm.attr("tabindex", 0);
 						rm.attr("role", "button");
 						rm.class("sapMColumnHeaderActive");
 						rm.attr("aria-haspopup", oMenu ? oMenu.getAriaHasPopupType().toLowerCase() : "dialog");
+						if (control.isA("sap.m.Label") && control.getRequired()) {
+							rm.attr("aria-describedby", InvisibleText.getStaticId("sap.m", "CONTROL_IN_COLUMN_REQUIRED"));
+						}
 					} else if (oTable.bFocusableHeaders) {
 						rm.attr("tabindex", 0);
 						rm.class("sapMColumnHeaderFocusable");
@@ -375,8 +378,8 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 		rm.openEnd();
 
 		if (!oControl.shouldRenderItems()) {
-			var vNoData = oControl.getNoData();
-			if (vNoData && typeof vNoData !== "string" && vNoData.isA("sap.m.IllustratedMessage")) {
+			if (oControl.getAggregation("_noColumnsMessage")) {
+				// If _noColumnsMessage is set, there is for sure an IllustratedMessage used for no data visualization
 				rm.renderControl(oControl.getAggregation("_noColumnsMessage"));
 			} else {
 				rm.text(Core.getLibraryResourceBundle("sap.m").getText("TABLE_NO_COLUMNS"));

package/src/sap/m/TableSelectDialog.js

@@ -105,7 +105,7 @@ sap.ui.define([
 	 * When using the <code>sap.m.TableSelectDialog</code> in SAP Quartz and Horizon themes, the breakpoints and layout paddings could be determined by the dialog's width. To enable this concept and add responsive paddings to an element of the control, you have to add the following classes depending on your use case: <code>sapUiResponsivePadding--header</code>, <code>sapUiResponsivePadding--subHeader</code>, <code>sapUiResponsivePadding--content</code>, <code>sapUiResponsivePadding--footer</code>.
 	 * @extends sap.m.SelectDialogBase
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Text.js

@@ -54,7 +54,7 @@ function(library, Core, Control, coreLibrary, Device, HyphenationSupport, TextRe
 	 * @implements sap.ui.core.IShrinkable, sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TextArea.js

@@ -84,7 +84,7 @@ function(
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Tile.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TileContainer.js

@@ -46,7 +46,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TileContent.js

@@ -24,7 +24,7 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 * @since 1.34.0
 	 *
 	 * @public
@@ -276,7 +276,7 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 	TileContent.prototype._getInnerText = function(oContentDom) {
 		var sAriaTooltipText = "";
 		var aHTMLCollection = [].slice.call(oContentDom.children);
-		aHTMLCollection.forEach(function(oElement) {
+		aHTMLCollection.forEach(function(oElement,iIndex) {
 			sAriaTooltipText += (oElement.innerText + "\n");
 		});
 		return sAriaTooltipText.trim();

package/src/sap/m/TimePicker.js

@@ -144,7 +144,7 @@ function(
 		 * @extends sap.m.DateTimeField
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @public
@@ -415,7 +415,8 @@ function(
 				src: this.getIconSrc(),
 				noTabStop: true,
 				title: "",
-				tooltip: this._oResourceBundle.getText("OPEN_PICKER_TEXT")
+				decorative: false,
+				useIconTooltip: false
 			});
 
 			// indicates whether the clock picker is still open
@@ -1066,40 +1067,6 @@ function(
 			return DateTimeField.prototype.setDateValue.apply(this, arguments);
 		};
 
-		/**
-		 * Sets tooltip of the control.
-		 *
-		 * @public
-		 * @override
-		 * @param {string|sap.ui.core.TooltipBase} vTooltip
-		 * @returns {this} A reference to <code>this</code> instance to allow method chaining.
-		 */
-		TimePicker.prototype.setTooltip = function(vTooltip) {
-			/*
-			 * We need this override the default setter from <code>sap.m.Input</code> because the super class method
-			 * doesn't respect the custom role id of the TimePicker which we add in 'aria-describedby' internally.
-			 */
-			var oDomRef = this.getDomRef(),
-				sTooltip;
-
-			this._refreshTooltipBaseDelegate(vTooltip);
-			this.setAggregation("tooltip", vTooltip, true);
-
-			if (!oDomRef) {
-				return this;
-			}
-
-			sTooltip = this.getTooltip_AsString();
-
-			if (sTooltip) {
-				oDomRef.setAttribute("title", sTooltip);
-			} else {
-				oDomRef.removeAttribute("title");
-			}
-
-			return this;
-		};
-
 		/**
 		 * Sets the locale of the control.
 		 *
@@ -1546,7 +1513,7 @@ function(
 			if (Device.system.phone) {
 				sArialabelledby = this.$("inner").attr("aria-labelledby");
 				sLabelId = sArialabelledby && sArialabelledby.split(" ")[0];
-				sLabel = sLabelId ? document.getElementById(sLabelId).getAttribute("aria-label") : "";
+				sLabel = sLabelId ? document.getElementById(sLabelId).textContent : "";
 
 				if (sLabel) {
 					oPicker.setTitle(sLabel);
@@ -1946,8 +1913,10 @@ function(
 			if (oTimePicker._checkStyle(sDisplayFormat)) {
 				sMask = LocaleData.getInstance(oLocale).getTimePattern(sDisplayFormat);
 			} else {
-				sDisplayFormat = sDisplayFormat.replace(/'/g, ""); // single quotes (like 'ч') are irrelevant for DateFormat, so they are for the mask
-				sMask = sDisplayFormat;
+				sMask = sDisplayFormat
+					.replace(/hh/ig, "h")
+					.replace(/h(?!')/ig, "h9")
+					.replace(/'h(?=')/ig, "'^h"); // add escape caret character for the mask before the hour character surrounded by single quotes
 			}
 
 			this._oTimePicker = oTimePicker;
@@ -1970,7 +1939,6 @@ function(
 			oTimePicker.setPlaceholderSymbol(PLACEHOLDER_SYMBOL);
 
 			//set hours allowed chars in the mask
-			sMask = sMask.replace(/hh/ig, "h").replace(/h/ig, "h9");
 			if (this.b24H) {
 				sAllowedHourChars = "[" + this.sLeadingRegexChar + "012]";
 			} else {
@@ -1987,9 +1955,14 @@ function(
 
 			//set minutes and seconds allowed chars in the mask
 			this.iMinuteNumber1Index = sMask.indexOf("mm");
-			sMask = sMask.replace(/mm/g, "59");
 			this.iSecondNumber1Index = sMask.indexOf("ss");
-			sMask = sMask.replace(/ss/g, "59");
+
+			sMask = sMask
+				.replace(/'mm(?=')/g, "'^mm")
+				.replace(/mm(?!')/g, "59")
+				.replace(/'ss(?=')/g, "'^ss")
+				.replace(/ss(?!')/g, "59")
+				.replace(/'/g, ""); // single quotes (like 'ч') are irrelevant for DateFormat, so they are for the mask
 
 			this._maskRuleMinSec = new MaskInputRule({
 				maskFormatSymbol: "5",

package/src/sap/m/TimePickerClock.js

@@ -25,7 +25,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/TimePickerClocks.js

@@ -50,7 +50,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/TimePickerInputs.js

@@ -49,7 +49,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 *
 		 * @constructor
 		 * @public