@openui5/sap.m 1.96.5 → 1.99.0

package/src/sap/m/TableSelectDialog.js

@@ -89,7 +89,7 @@ sap.ui.define([
 	 * <li>Since version 1.58, the columns headers and the info toolbar are sticky (remain fixed on top when scrolling). This feature is not supported in all browsers.
 	 * <li>The TableSelectDialog is usually displayed at the center of the screen. Its size and position can be changed by the user.
 	 * To enable this you need to set the <code>resizable</code> and <code>draggable</code> properties. Both properties are available only in desktop mode.</li>
-	 * For more information on browser support limitations, you can refer to the {@link sap.m.ListBase sap.m.ListBase} <code>sticky</code> property.
+	 * For more information on current restrictions, you can refer to the {@link sap.m.ListBase sap.m.ListBase} <code>sticky</code> property.
 	 * </ul>
 	 * <h3>Responsive Behavior</h3>
 	 * <ul>
@@ -98,7 +98,7 @@ sap.ui.define([
 	 * When using the <code>sap.m.TableSelectDialog</code> in SAP Quartz 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.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public
@@ -507,7 +507,7 @@ sap.ui.define([
 
 	/**
 	* Shows the busy state and is called after the renderer is finished.
-	* @overwrite
+	* @override
 	* @protected
 	* @returns {this} this pointer for chaining
 	*/
@@ -523,7 +523,7 @@ sap.ui.define([
 
 	/**
 	* Invalidates the dialog instead of this control, as there is no renderer.
-	* @overwrite
+	* @override
 	* @protected
 	* @returns {this} this pointer for chaining
 	*/
@@ -649,9 +649,9 @@ sap.ui.define([
 
 	/**
 	 * Enables/Disables busy state.
-	 * @overwrite
+	 * @override
 	 * @public
-	 * @param {boolean} flag for enabling busy indicator
+	 * @param {boolean} bBusy flag for enabling busy indicator
 	 * @returns {this} this pointer for chaining
 	 */
 	TableSelectDialog.prototype.setBusy = function (bBusy) {
@@ -666,7 +666,7 @@ sap.ui.define([
 
 	/**
 	 * Gets current busy state.
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @returns {boolean} value of currtent busy state.
 	 */
@@ -691,7 +691,7 @@ sap.ui.define([
 
 	/**
 	 * Enables/Disables multi selection mode.
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param {boolean} bMulti flag for multi selection mode
 	 * @returns {this} this pointer for chaining
@@ -715,7 +715,7 @@ sap.ui.define([
 
 	/**
 	 * Sets the title of the internal dialog
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param {string} sTitle the title text for the dialog
 	 * @returns {this} this pointer for chaining
@@ -750,7 +750,7 @@ sap.ui.define([
 
 	/**
 	 * Sets the no data text of the internal table
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param {string} sNoDataText the no data text for the table
 	 */
@@ -762,7 +762,7 @@ sap.ui.define([
 
 	/**
 	 * Retrieves the internal List's no data text property
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @returns {string} the current no data text
 	 */
@@ -772,7 +772,7 @@ sap.ui.define([
 
 	/**
 	 * Retrieves content width of the select dialog {@link sap.m.Dialog}
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @returns {sap.ui.core.CSSSize} sWidth the content width of the internal dialog
 	 */
@@ -784,7 +784,7 @@ sap.ui.define([
 	 * Sets content width of the select dialog {@link sap.m.Dialog}
 	 * @param {sap.ui.core.CSSSize} sWidth the new content width value for the dialog
 	 * @public
-	 * @overwrite
+	 * @override
 	 * @returns {this} this pointer for chaining
 	 */
 	TableSelectDialog.prototype.setContentWidth = function (sWidth) {
@@ -795,7 +795,7 @@ sap.ui.define([
 
 	/**
 	 * Retrieves content height of the select dialog {@link sap.m.Dialog}
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @returns {sap.ui.core.CSSSize} sHeight the content height of the internal dialog
 	 */
@@ -807,7 +807,7 @@ sap.ui.define([
 	 * Sets content height of the select dialog {@link sap.m.Dialog}
 	 * @param {sap.ui.core.CSSSize} sHeight the new content height value for the dialog
 	 * @public
-	 * @overwrite
+	 * @override
 	 * @returns {this} this pointer for chaining
 	 */
 	TableSelectDialog.prototype.setContentHeight = function (sHeight) {
@@ -903,10 +903,10 @@ sap.ui.define([
 
 	/**
 	 * Sets the model for the internal table and the current control, so that both controls can be used with data binding.
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param {sap.ui.model.Model} oModel The model that holds the data for the table
-	 * @param {string} [sName] The optional model name
+	 * @param {string} [sModelName] The optional model name
 	 * @returns {this} This pointer for chaining
 	 */
 	TableSelectDialog.prototype.setModel = function (oModel, sModelName) {

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.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TextArea.js

@@ -82,7 +82,7 @@ function(
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public
@@ -613,8 +613,8 @@ function(
 	 */
 	TextArea.prototype._behaviour = (function(oDevice) {
 		return {
-			INSIDE_SCROLLABLE_WITHOUT_FOCUS : oDevice.os.ios || oDevice.os.blackberry || oDevice.browser.chrome,
-			PAGE_NON_SCROLLABLE_AFTER_FOCUS : oDevice.os.android && oDevice.os.version >= 4.1
+			INSIDE_SCROLLABLE_WITHOUT_FOCUS : oDevice.os.ios || oDevice.browser.chrome,
+			PAGE_NON_SCROLLABLE_AFTER_FOCUS : oDevice.os.android
 		};
 	}(Device));
 
@@ -666,41 +666,6 @@ function(
 		}
 	};
 
-	// Flag for the Fiori Client on Windows Phone
-	var _bMSWebView = Device.os.windows_phone && (/MSAppHost/i).test(navigator.appVersion);
-
-	/**
-	 * Special handling for the focusing issue in SAP Fiori Client on Windows Phone.
-	 * @param {jQuery.Event} oEvent The event object
-	 * @private
-	 */
-	TextArea.prototype.onfocusin = function(oEvent) {
-		var scrollContainer,
-			$this = this.$();
-
-		InputBase.prototype.onfocusin.apply(this, arguments);
-
-		// Workaround for the scroll-into-view bug in the WebView Windows Phone 8.1
-		// As the browser does not scroll the window as it should, scroll the parent scroll container to make the hidden text visible
-
-		function scrollIntoView() {
-			jQuery(window).scrollTop(0);
-			scrollContainer.scrollTop($this.offset().top - scrollContainer.offset().top + scrollContainer.scrollTop());
-		}
-
-		if (_bMSWebView && $this.height() + $this.offset().top > 260) {
-			for (scrollContainer = $this.parent(); scrollContainer[0]; scrollContainer = scrollContainer.parent()) {
-				if (scrollContainer.css("overflow-y") == "auto") {
-					// make sure to have enough padding to be able to scroll even the bottom control to the top of the screen
-					scrollContainer.children().last().css("padding-bottom", jQuery(window).height() + "px");
-					// do scroll
-					window.setTimeout(scrollIntoView, 100);
-					return;
-				}
-			}
-		}
-	};
-
 	/**
 	 * Special handling for Enter key which triggers the FieldGroupNavigation on Enter. This treatment is only relevant
 	 * for the Enter key itself, as this is used in TextArea to start a new line.

package/src/sap/m/TextAreaRenderer.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 *
 	 * @override
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
+	 * @param {sap.m.TextArea} oControl An object representation of the control that should be rendered.
 	 */
 	TextAreaRenderer.endInputTag = function(oRm, oControl) {
 		oRm.openEnd();

package/src/sap/m/Tile.js

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

package/src/sap/m/TileContainer.js

@@ -44,7 +44,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TileContainerRenderer.js

@@ -25,7 +25,7 @@ sap.ui.define([],
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} rm The RenderManager that can be used for writing to the Render-Output-Buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.TileContainer} oControl an object representation of the control that should be rendered
 	 */
 	TileContainerRenderer.render = function(rm, oControl) {
 		var id =  oControl.getId();

package/src/sap/m/TileContent.js

@@ -20,7 +20,7 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @since 1.34.0
 	 *
 	 * @public
@@ -139,7 +139,7 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 	/**
 	 * Returns the ContentType
 	 * @private
-	 * @returns {String} The ContentType text
+	 * @returns {string} The ContentType text
 	 */
 	TileContent.prototype._getContentType = function() {
 		if (this.getContent()) {
@@ -153,7 +153,7 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 	/**
 	 * Returns the Footer text
 	 * @private
-	 * @returns {String} The Footer text
+	 * @returns {string} The Footer text
 	 */
 	TileContent.prototype._getFooterText = function() {
 		var resourceBundle = sap.ui.getCore().getLibraryResourceBundle('sap.m');
@@ -177,7 +177,7 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 	/**
 	 * Returns the Alttext
 	 *
-	 * @returns {String} The AltText text
+	 * @returns {string} The AltText text
 	 */
 	TileContent.prototype.getAltText = function() {
 		var sAltText = "";

package/src/sap/m/TileContentRenderer.js

@@ -24,7 +24,7 @@ sap.ui.define(["./library", "sap/base/security/encodeCSS", "sap/m/GenericTile",
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.TileContent} oControl An object representation of the control that should be rendered
 	 */
 	TileContentRenderer.render = function(oRm, oControl) {
 
@@ -54,7 +54,7 @@ sap.ui.define(["./library", "sap/base/security/encodeCSS", "sap/m/GenericTile",
 	 *
 	 * @private
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control whose content should be rendered
+	 * @param {sap.m.TileContent} oControl an object representation of the control whose content should be rendered
 	 */
 	TileContentRenderer._renderContent = function(oRm, oControl) {
 		if (!oControl._bRenderContent) {
@@ -116,7 +116,7 @@ sap.ui.define(["./library", "sap/base/security/encodeCSS", "sap/m/GenericTile",
 	 *
 	 * @private
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control whose footer should be rendered
+	 * @param {sap.m.TileContent} oControl an object representation of the control whose footer should be rendered
 	 */
 
 	TileContentRenderer._renderFooter = function(oRm, oControl) {

package/src/sap/m/TileRenderer.js

@@ -22,7 +22,7 @@ sap.ui.define([],
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 * @param {sap.ui.core.RenderManager} rm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.Tile} oControl An object representation of the control that should be rendered
 	 */
 	TileRenderer.render = function(rm, oControl) {
 		var oTileContainer,

package/src/sap/m/TimePicker.js

@@ -140,7 +140,7 @@ function(
 		 * @extends sap.m.DateTimeField
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public
@@ -232,7 +232,30 @@ function(
 					 *
 					 * - on both device types, if there is a keyboard attached: 24 or 00 can be typed directly.
 					 */
-					support2400: {type: "boolean", group: "Misc", defaultValue: false}
+					support2400: {type: "boolean", group: "Misc", defaultValue: false},
+
+					/**
+					 * Determines whether the input field of the picker is hidden or visible.
+					 * When set to <code>true</code>, the input field becomes invisible and there is no way to open the picker popover.
+					 * In that case it can be opened by another control through calling of picker's <code>openBy</code> method, and
+					 * the opening control's DOM reference must be provided as parameter.
+					 *
+					 * Note: Since the picker is not responsible for accessibility attributes of the control which opens its popover,
+					 * those attributes should be added by the application developer. The following is recommended to be added to the
+					 * opening control: a text or tooltip that describes the action (example: "Open Time Picker"), and also aria-haspopup
+					 * attribute with value of <code>sap.ui.core.aria.HasPopup.Dialog</code>.
+					 *
+					 * @since 1.97
+					 */
+					hideInput: { type: "boolean", group: "Misc", defaultValue: false },
+
+					/**
+					 * Determines whether there is a shortcut navigation to current time.
+					 *
+					 * @since 1.98
+					 */
+					showCurrentTimeButton : {type : "boolean", group : "Behavior", defaultValue : false}
+
 				},
 				aggregations: {
 
@@ -531,7 +554,8 @@ function(
 		 * @returns {boolean} true if the icon is clicked.
 		 */
 		 TimePicker.prototype._isIconClicked = function (oEvent) {
-			return jQuery(oEvent.target).hasClass("sapUiIcon") || jQuery(oEvent.target).hasClass("sapMInputBaseIconContainer");
+			return jQuery(oEvent.target).hasClass("sapUiIcon") || jQuery(oEvent.target).hasClass("sapMInputBaseIconContainer")
+				 || jQuery(oEvent.target).hasClass("sapUiIconTitle");
 		};
 
 		/**
@@ -1073,6 +1097,16 @@ function(
 			return this;
 		};
 
+			TimePicker.prototype.setShowCurrentTimeButton = function(bShow) {
+			var oClocks = this._getClocks(),
+				oNumericPicker = this._getNumericPicker();
+
+			oClocks && oClocks.setShowCurrentTimeButton(bShow);
+			oNumericPicker && oNumericPicker.getContent()[0].setShowCurrentTimeButton(bShow);
+
+			return this.setProperty("showCurrentTimeButton", bShow);
+		};
+
 		/**
 		 * @private
 		 * @returns {string} default display format style
@@ -1286,22 +1320,45 @@ function(
 			}
 		};
 
+		/**
+		 * Opens the picker popover. The popover is positioned relatively to the control given as <code>oDomRef</code> parameter on tablet or desktop
+		 * and is full screen on phone. Therefore the control parameter is only used on tablet or desktop and is ignored on phone.
+		 *
+		 * Note: use this method to open the picker popover only when the <code>hideInput</code> property is set to <code>true</code>. Please consider
+		 * opening of the picker popover by another control only in scenarios that comply with Fiori guidelines. For example, opening the picker popover
+		 * by another popover is not recommended.
+		 * The application developer should implement the following accessibility attributes to the opening control: a text or tooltip that describes
+		 * the action (example: "Open Time Picker"), and aria-haspopup attribute with value of <code>sap.ui.core.aria.HasPopup.Dialog</code>.
+		 *
+		 * @since 1.97
+		 * @param {HTMLElement} oDomRef DOM reference of the opening control. On tablet or desktop, the popover is positioned relatively to this control.
+		 * @public
+		 */
+		TimePicker.prototype.openBy = function(oDomRef) {
+			this._openPicker(oDomRef);
+		};
+
 		/**
 		 * Opens the picker.
 		 *
 		 * Creates the picker if necessary.
 		 *
+		 * @param {HTMLElement} oDomRef DOM reference of the opening control. On tablet or desktop, the TimePicker popover is positioned relative to this control.
 		 * @returns {sap.m.ResponsivePopover} The picker part as a control, used for chaining
 		 * @private
 		 */
-		TimePicker.prototype._openPicker = function () {
+		TimePicker.prototype._openPicker = function (oDomRef) {
 			var oPicker = this._getPicker();
 
 			if (!oPicker) {
 				oPicker = this._createPicker(this._getDisplayFormatPattern());
 			}
 
-			oPicker.open();
+			if (!oDomRef) {
+				oDomRef = this.getDomRef();
+			}
+
+			oPicker.openBy(oDomRef);
 			oPicker.getContent()[0]._sMinutes = this._sMinutes;
 			oPicker.getContent()[0]._sSeconds = this._sSeconds;
 
@@ -1406,7 +1463,8 @@ function(
 				valueFormat: sFormat,
 				localeId: sLocaleId,
 				minutesStep: this.getMinutesStep(),
-				secondsStep: this.getSecondsStep()
+				secondsStep: this.getSecondsStep(),
+				showCurrentTimeButton: this.getShowCurrentTimeButton()
 			});
 			oClocks._setAcceptCallback(this._handleOkPress.bind(this));
 
@@ -1520,7 +1578,8 @@ function(
 						valueFormat: sFormat,
 						localeId: sLocaleId,
 						minutesStep: this.getMinutesStep(),
-						secondsStep: this.getSecondsStep()
+						secondsStep: this.getSecondsStep(),
+						showCurrentTimeButton: this.getShowCurrentTimeButton()
 					})
 				],
 				footer: [
@@ -2092,7 +2151,7 @@ function(
 		 * Shifts hours, minutes and seconds indexes if period ("a", see http://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table)
 		 * is before corresponding hours, minutes & seconds fields.
 		 *
-		 * @param {Number} shiftValue the shift value
+		 * @param {number} shiftValue the shift value
 		 */
 		TimeSemanticMaskHelper.prototype.shiftIndexes = function(shiftValue) {
 			if (this.iAmPmChar1Index < this.iHourNumber1Index) { //both a and h,hh,H,HH exist in this case

package/src/sap/m/TimePickerClock.js

@@ -26,7 +26,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @private
@@ -564,7 +564,7 @@ sap.ui.define([
 		 *
 		 * @private
 		 */
-		 TimePickerClock.prototype._resetLongTouch = function() {
+		TimePickerClock.prototype._resetLongTouch = function() {
 			if (this._longTouchId) {
 				clearTimeout(this._longTouchId);
 			}
@@ -573,10 +573,9 @@ sap.ui.define([
 		/**
 		 * Starts new long touch period.
 		 *
-		 * @param {boolean} bStartNew Whether to start new long touch period after clearing previous one
 		 * @private
 		 */
-		 TimePickerClock.prototype._startLongTouch = function() {
+		TimePickerClock.prototype._startLongTouch = function() {
 			this._longTouchId = setTimeout(function() {
 				var iValue = this._iSelectedValue;
 				this._longTouchId = null;
@@ -584,7 +583,7 @@ sap.ui.define([
 					this._toggle2400();
 				}
 			}.bind(this), LONG_TOUCH_DURATION);
-		 };
+		};
 
 		/**
 		 * Returns real maximum value of the clock items depending on existing of inner items.
@@ -605,7 +604,7 @@ sap.ui.define([
 		 * @returns {this} the clock object for chaining
 		 * @private
 		 */
-		 TimePickerClock.prototype._toggle2400 = function(bSkipSelection) {
+		TimePickerClock.prototype._toggle2400 = function(bSkipSelection) {
 			var bIs24HoursVisible = this._get24HoursVisible(),
 				iValue = bIs24HoursVisible ? 0 : 24;
 			this._cancelTouchOut = true;

package/src/sap/m/TimePickerClockRenderer.js

@@ -22,7 +22,7 @@ sap.ui.define([],
 		 * Renders the HTML for a {@link sap.m.TimePickerClock}, using the provided {@link sap.ui.core.RenderManager}.
 		 *
 		 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
-		 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+		 * @param {sap.m.TimePickerClock} oControl An object representation of the control that should be rendered
 		 */
 		TimePickerClockRenderer.render = function(oRm, oControl) {
 			var	iReplacement = oControl.getLastItemReplacement(),

package/src/sap/m/TimePickerClocks.js

@@ -50,7 +50,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public
@@ -991,6 +991,11 @@ sap.ui.define([
 					tooltip: this._oResourceBundle.getText("TIMEPICKER_AMPM_BUTTON_TOOLTIP")
 				}));
 			}
+
+			if (!this.getAggregation("_nowButton")) {
+				this.setAggregation("_nowButton", this._getCurrentTimeButton());
+			}
+
 			aButtons = this.getAggregation("_buttons");
 			aClocks = this.getAggregation("_clocks");
 			this._clockCount = aClocks.length;
@@ -1016,10 +1021,11 @@ sap.ui.define([
 		/**
 		 * Attaches events of the clocks.
 		 *
-		 * @param {sap.m.Input} oInput Input object to attach events to
+		 * @param {sap.m.TimePickerClock} oClock Clock to attach events to
+		 * @param {sap.m.internal.ToggleSpinButton} oButton button to attach events to
 		 * @private
 		 */
-		 TimePickerClocks.prototype._attachEvents = function(oClock, oButton) {
+		TimePickerClocks.prototype._attachEvents = function(oClock, oButton) {
 
 			oClock.attachChange(function(oEvent) {
 				var iSelected = oEvent.getParameter("value"),
@@ -1073,7 +1079,7 @@ sap.ui.define([
 		 * @param {int} iClockIndex the index (in _clocks aggregation) of the clock
 		 * @private
 		 */
-		 TimePickerClocks.prototype._switchClock = function(iClockIndex) {
+		TimePickerClocks.prototype._switchClock = function(iClockIndex) {
 			var aClocks = this.getAggregation("_clocks"),
 				aButtons = this.getAggregation("_buttons"),
 				oActiveClock = this._getActiveClock();
@@ -1156,7 +1162,7 @@ sap.ui.define([
 		 * @param {boolean} bEnabled An enabled state
 		 * @private
 		 */
-		 TimePickerClocks.prototype._setControlValueAndEnabled = function (oClock, oButton, vValue, bEnabled) {
+		TimePickerClocks.prototype._setControlValueAndEnabled = function (oClock, oButton, vValue, bEnabled) {
 			oClock.setSelectedValue(parseInt(vValue));
 			oClock.setEnabled(bEnabled);
 			oButton.setEnabled(bEnabled);

package/src/sap/m/TimePickerClocksRenderer.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 	 * Renders the HTML for the given {@link sap.m.TimePickerClocks} control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRM The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.TimePickerClocks} oControl An object representation of the control that should be rendered
 	 */
 	TimePickerClocksRenderer.render = function(oRm, oControl) {
 		oRm.openStart("div", oControl); // outer wrapper
@@ -38,7 +38,7 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 	 * Renders the buttons for the given {@link sap.m.TimePickerClocks} control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRM The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.TimePickerClocks} oControl An object representation of the control that should be rendered
 	 */
 	TimePickerClocksRenderer.renderButtons = function(oRm, oControl) {
 		var aButtons = oControl.getAggregation("_buttons"),
@@ -72,6 +72,8 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 				}
 			}
 
+			oRm.renderControl(oControl._getCurrentTimeButton());
+
 			oRm.close("div"); // buttons wrapper
 
 		}
@@ -81,7 +83,7 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 	 * Renders the clocks for the given {@link sap.m.TimePickerClocks} control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRM The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.TimePickerClocks} oControl An object representation of the control that should be rendered
 	 */
 	TimePickerClocksRenderer.renderClocks = function(oRm, oControl) {
 		var aClocks = oControl.getAggregation("_clocks"),

package/src/sap/m/TimePickerInputs.js

@@ -49,7 +49,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public
@@ -632,6 +632,11 @@ sap.ui.define([
 					tooltip: this._oResourceBundle.getText("TIMEPICKER_AMPM_BUTTON_TOOLTIP")
 				}));
 			}
+
+			if (!this.getAggregation("_nowButton")) {
+				this.setAggregation("_nowButton", this._getCurrentTimeButton());
+			}
+
 			aInputs = this.getAggregation("_inputs");
 			this._inputCount = aInputs.length;
 			this._switchInput(0);

package/src/sap/m/TimePickerInputsRenderer.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 	 * Renders the HTML for the given {@link sap.m.TimePickerInputs} control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRM The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.TimePickerInputs} oControl An object representation of the control that should be rendered
 	 */
 	TimePickerInputsRenderer.render = function(oRm, oControl) {
 		var aControls = oControl.getAggregation("_inputs"),
@@ -54,6 +54,8 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 				}
 			}
 
+			oRm.renderControl(oControl._getCurrentTimeButton());
+
 			oRm.close("div"); // outer wrapper
 		}
 	};