@openui5/sap.m 1.97.1 → 1.99.1

package/src/sap/m/DateTimePicker.js

@@ -12,17 +12,22 @@ sap.ui.define([
 	'sap/ui/model/type/Date',
 	'sap/ui/unified/DateRange',
 	'./library',
+	'sap/ui/core/library',
 	'sap/ui/core/Control',
 	'sap/ui/Device',
 	'sap/ui/core/format/DateFormat',
+	'sap/ui/core/format/DateFormatTimezoneDisplay',
 	'sap/ui/core/LocaleData',
+	'sap/ui/core/Core',
+	'./TimePickerClocks',
 	'./DateTimePickerRenderer',
 	'./SegmentedButton',
 	'./SegmentedButtonItem',
 	'./ResponsivePopover',
 	'./Button',
 	"sap/ui/events/KeyCodes",
-	"sap/ui/core/IconPool"
+	"sap/ui/core/IconPool",
+	"sap/ui/qunit/utils/waitForThemeApplied"
 ], function(
 	jQuery,
 	InputBase,
@@ -30,17 +35,22 @@ sap.ui.define([
 	Date1,
 	DateRange,
 	library,
+	coreLibrary,
 	Control,
 	Device,
 	DateFormat,
+	DateFormatTimezoneDisplay,
 	LocaleData,
+	Core,
+	TimePickerClocks,
 	DateTimePickerRenderer,
 	SegmentedButton,
 	SegmentedButtonItem,
 	ResponsivePopover,
 	Button,
 	KeyCodes,
-	IconPool
+	IconPool,
+	waitForThemeApplied
 ) {
 	"use strict";
 
@@ -48,7 +58,8 @@ sap.ui.define([
 	var PlacementType = library.PlacementType,
 		ButtonType = library.ButtonType,
 		// From sap.ui.Device.media.RANGESETS.SAP_STANDARD - "Phone": For screens smaller than 600 pixels.
-		STANDART_PHONE_RANGESET = "Phone";
+		STANDART_PHONE_RANGESET = "Phone",
+		CalendarType = coreLibrary.CalendarType;
 
 	/**
 	 * Constructor for a new <code>DateTimePicker</code>.
@@ -134,7 +145,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.97.1
+	 * @version 1.99.1
 	 *
 	 * @constructor
 	 * @public
@@ -159,10 +170,59 @@ sap.ui.define([
 			 * The seconds clock is populated only by multiples of the step.
 			 * @since 1.56
 			 */
-			secondsStep: {type: "int", group: "Misc", defaultValue: 1 }
+			secondsStep: {type: "int", group: "Misc", defaultValue: 1 },
+
+			/**
+			 * Determines whether there is a shortcut navigation to current time.
+			 *
+			 * @since 1.98
+			 */
+			showCurrentTimeButton: { type: "boolean", group: "Behavior", defaultValue: false },
+
+			/**
+			 * Determines whether to show the timezone or not.
+			 * @since 1.99
+			 */
+			showTimezone: { type: "boolean", group: "Behavior" },
+
+			/**
+			 * The IANA timezone ID, e.g <code>"Europe/Berlin"</code>. Date and time are displayed in this timezone.
+			 * The <code>value</code> property string is treated as if it is formatted in this timezone.
+			 * However, the <code>dateValue</code> property is a JS Date object, which is the same point in time
+			 * as the <code>value</code>, but in the local timezone. Thus, it is adjusted when the
+			 * <code>timezone</code> changes.
+			 * @since 1.99
+			 */
+			timezone: { type: "string", group: "Data" }
 		},
 		designtime: "sap/m/designtime/DateTimePicker.designtime",
 		dnd: { draggable: false, droppable: true }
+	}, constructor: function(sId, mSettings, oScope) {
+		var mSortedSettings;
+
+		if ( typeof sId !== 'string' && sId !== undefined ) {
+			// shift arguments in case sId was missing, but mSettings was given
+			oScope = mSettings;
+			mSettings = sId;
+			sId = mSettings && mSettings.id;
+		}
+
+		mSortedSettings = mSettings ? Object.keys(mSettings)
+			.sort(function(sKey1, sKey2) {
+				if (sKey1 === "timezone") {
+					return -1;
+				} else if (sKey2 === "timezone") {
+					return 1;
+				}
+
+				return 0;
+			})
+			.reduce(function (acc, key) {
+					acc[key] = mSettings[key];
+					return acc;
+			}, {}) : mSettings;
+
+		DatePicker.call(this, sId, mSortedSettings, oScope);
 	}});
 
 	var DateTimeFormatStyles = {
@@ -176,6 +236,10 @@ sap.ui.define([
 
 		metadata: {
 			library : "sap.m",
+			properties: {
+				/* This property can be set to force the Phone view even if the device is not a phone */
+				forcePhoneView : {type : "boolean", group : "Behavior", defaultValue : false}
+			},
 			aggregations: {
 				_switcher  : {type: "sap.ui.core.Control", multiple: false, visibility: "hidden"},
 				calendar   : {type: "sap.ui.core.Control", multiple: false},
@@ -199,7 +263,6 @@ sap.ui.define([
 					oRm.openEnd();
 					oRm.renderControl(oSwitcher);
 					oRm.close("div");
-
 				}
 
 				var oCalendar = oPopup.getCalendar();
@@ -230,7 +293,7 @@ sap.ui.define([
 			var oSwitcher = this.getAggregation("_switcher");
 
 			if (!oSwitcher) {
-				var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+				var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
 				var sDateText = oResourceBundle.getText("DATETIMEPICKER_DATE");
 				var sTimeText = oResourceBundle.getText("DATETIMEPICKER_TIME");
 
@@ -239,7 +302,7 @@ sap.ui.define([
 					selectedKey: "Cal",
 					items: [
 						new SegmentedButtonItem(this.getId() + "-Switch-Cal", {key: "Cal", text: sDateText}),
-						new SegmentedButtonItem(this.getId() + "-Switch-Sli", {key: "Sli", text: sTimeText})
+						new SegmentedButtonItem(this.getId() + "-Switch-Clk", {key: "Clk", text: sTimeText})
 					]
 				});
 				oSwitcher.attachSelect(this._handleSelect, this);
@@ -247,7 +310,7 @@ sap.ui.define([
 				this.setAggregation("_switcher", oSwitcher, true);
 			}
 
-			if (Device.system.phone || jQuery('html').hasClass("sapUiMedia-Std-Phone")) {
+			if (Device.system.phone || jQuery('html').hasClass("sapUiMedia-Std-Phone") || this.getForcePhoneView()) {
 				oSwitcher.setVisible(true);
 				oSwitcher.setSelectedKey("Cal");
 			} else {
@@ -257,30 +320,38 @@ sap.ui.define([
 		},
 
 		onAfterRendering: function() {
-			if (Device.system.phone || jQuery('html').hasClass("sapUiMedia-Std-Phone")) {
+			if (Device.system.phone || jQuery('html').hasClass("sapUiMedia-Std-Phone") || this.getForcePhoneView()) {
 				var oSwitcher = this.getAggregation("_switcher");
 				var sKey = oSwitcher.getSelectedKey();
 				this._switchVisibility(sKey);
 			}
+
 		},
 
 		_handleSelect: function(oEvent) {
 
-			this._switchVisibility(oEvent.getParameter("key"));
+			var sKey = oEvent.getParameter("key");
+
+			this._switchVisibility(sKey);
+			if (sKey === "Clk") {
+				this.getClocks()._focusActiveButton();
+			}
+
 		},
 
 		_switchVisibility: function(sKey) {
 
-			var oCalendar = this.getCalendar();
-			var oClocks = this.getClocks();
+			var oCalendar = this.getCalendar(),
+				oClocks = this.getClocks();
 
 			if (!oCalendar || !oClocks) {
 				return;
 			}
 
-			if (sKey == "Cal") {
+			if (sKey === "Cal") {
 				oCalendar.$().css("display", "");
 				oClocks.$().css("display", "none");
+				oCalendar.getFocusDomRef() && oCalendar.getFocusDomRef().focus();
 			} else {
 				oCalendar.$().css("display", "none");
 				oClocks.$().css("display", "");
@@ -292,8 +363,8 @@ sap.ui.define([
 
 			var oSwitcher = this.getAggregation("_switcher");
 			if (oSwitcher && oSwitcher.getVisible()) {
-				oSwitcher.setSelectedKey("Sli");
-				this._switchVisibility("Sli");
+				oSwitcher.setSelectedKey("Clk");
+				this._switchVisibility("Clk");
 			}
 
 		},
@@ -301,6 +372,7 @@ sap.ui.define([
 		getSpecialDates: function() {
 
 			return this._oDateTimePicker.getSpecialDates();
+
 		},
 
 		onkeydown: function(oEvent) {
@@ -325,6 +397,60 @@ sap.ui.define([
 		this._bOnlyCalendar = false;
 	};
 
+	DateTimePicker.prototype.setTimezone = function(sTimezone) {
+		var oCurrentDateValue,
+			sFormattedValue,
+			oNewDateValue;
+
+		oCurrentDateValue = this.getDateValue() || this._parseValue(this.getValue(), false);
+		sFormattedValue = this._formatValue(oCurrentDateValue, false);
+
+		this.setProperty("timezone", sTimezone);
+
+		this._oDisplayFormat = null;
+		this._oValueFormat = null;
+		this._oDisplayFormatWithTimezone = null;
+		this._oValueFormatWithTimezone = null;
+
+		if (this._oTimezonePopup) {
+			this._oTimezonePopup.setTitle(sTimezone);
+		}
+
+		// the dateValue should be adjusted, and the value re-formatted
+		oNewDateValue = this._parseValue(sFormattedValue, true);
+		if (oNewDateValue) {
+			this.setProperty("dateValue", oNewDateValue);
+			this.setProperty("value", this._formatValue(oNewDateValue, true));
+		}
+
+		return this;
+	};
+
+	DateTimePicker.prototype.ontap = function(oEvent) {
+		if (oEvent.target.parentElement.classList.contains("sapMDTPTimezoneLabel")) {
+			this._togglePopoverOpen(this._getTimezoneNamePopup(), oEvent.target);
+			return;
+		}
+
+		DatePicker.prototype.ontap.apply(this, arguments);
+	};
+
+	DateTimePicker.prototype.onAfterRendering = function() {
+		if (this._getShowTimezone()) {
+			waitForThemeApplied().then(function() {
+				var oDummyContentDomRef = this.$().find(".sapMDummyContent"),
+					iDummyWidth;
+
+				if (!oDummyContentDomRef || !oDummyContentDomRef.length) {
+					return;
+				}
+
+				iDummyWidth = oDummyContentDomRef[0].getBoundingClientRect().width;
+				this.$("inner").css("max-width", (iDummyWidth + 2) + "px");
+			}.bind(this));
+		}
+	};
+
 	/**
 	 * Apply the correct icon to the used Date control
 	 * @protected
@@ -342,15 +468,17 @@ sap.ui.define([
 			delete this._oClocks;
 		}
 
+		this._oTimezonePopup = undefined;
 		this._oPopupContent = undefined; // is destroyed via popup aggregation - just remove reference
 		Device.media.detachHandler(this._handleWindowResize, this);
 	};
 
 	DateTimePicker.prototype.setDisplayFormat = function(sDisplayFormat) {
-
+		this._oDisplayFormatWithTimezone = null;
 		DatePicker.prototype.setDisplayFormat.apply(this, arguments);
 
 		if (this._oClocks) {
+			this._oClocks.setValueFormat(_getTimePattern.call(this));
 			this._oClocks.setDisplayFormat(_getTimePattern.call(this));
 		}
 
@@ -358,6 +486,11 @@ sap.ui.define([
 
 	};
 
+	DateTimePicker.prototype.setValueFormat = function(sValueFormat) {
+		this._oValueFormatWithTimezone = null;
+		return DatePicker.prototype.setValueFormat.apply(this, arguments);
+	};
+
 	DateTimePicker.prototype.setMinutesStep = function(iMinutesStep) {
 
 		this.setProperty('minutesStep', iMinutesStep, true);
@@ -404,30 +537,167 @@ sap.ui.define([
 
 	};
 
-	DateTimePicker.prototype._getFormatInstance = function(oArguments, bDisplayFormat){
+	DateTimePicker.prototype.setShowCurrentTimeButton = function(bShow) {
+		var oClocks = this._oClocks;
 
-		var oMyArguments = jQuery.extend({}, oArguments);
+		oClocks && oClocks.setShowCurrentTimeButton(bShow);
+
+		return this.setProperty("showCurrentTimeButton", bShow);
+	};
 
-		// check for mixed styles
-		var iSlashIndex = -1;
+	DateTimePicker.prototype._getTimezoneNamePopup = function() {
+		var oResourceBundle;
 
-		if (oMyArguments.style) {
-			iSlashIndex = oMyArguments.style.indexOf("/");
+		if (this._oTimezonePopup) {
+			return this._oTimezonePopup;
 		}
 
-		if (bDisplayFormat) {
-			// also create a date formatter as fallback for parsing
-			var oDateArguments = jQuery.extend({}, oMyArguments);
+		this._oTimezonePopup = new ResponsivePopover({
+			showArrow: false,
+			placement: PlacementType.VerticalPreferredBottom,
+			offsetX: 0,
+			offsetY: 3,
+			horizontalScrolling: false,
+			title: this._getTimezone(true)
+		});
 
-			if (iSlashIndex > 0) {
-				oDateArguments.style = oDateArguments.style.substr(0, iSlashIndex);
-			}
+		this.addDependent(this._oTimezonePopup);
+
+		if (Device.system.phone) {
+			oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+
+			this._oTimezonePopup.setEndButton(new Button({
+				text: oResourceBundle.getText("SUGGESTIONSPOPOVER_CLOSE_BUTTON"),
+				type: ButtonType.Emphasized,
+				press: function () {
+					this._oTimezonePopup.close();
+				}.bind(this)
+			}));
+		}
+
+		return this._oTimezonePopup;
+	};
+
+	DateTimePicker.prototype._togglePopoverOpen = function(oPopover, oOpenerDomRef) {
+		if (oPopover.isOpen()) {
+			oPopover.close();
+		} else {
+			oPopover.openBy(oOpenerDomRef || this.getDomRef());
+		}
+	};
+
+	DateTimePicker.prototype._getFormatter = function(bDisplayFormat) {
+		var sCacheName = this._getTimezoneFormatterCacheName(bDisplayFormat);
 
-			this._oDisplayFormatDate = DateFormat.getInstance(oDateArguments);
+		if (!this[sCacheName]) {
+			this[sCacheName] = DateFormat.getDateTimeWithTimezoneInstance(this._getTimezoneFormatOptions(bDisplayFormat));
 		}
 
-		return DateFormat.getDateTimeInstance(oMyArguments);
+		return this[sCacheName];
+	};
+
+	/**
+	 * Gets the format options of the value or dateValue binding with timezone.
+	 * @returns {object} The binding format options or an empty object instance.
+	 * @private
+	 */
+	DateTimePicker.prototype._getBindingWithTimezoneFormatOptions = function() {
+		var oBinding = this.getBinding("value") || this.getBinding("dateValue"),
+			oBindingType;
 
+		if (oBinding) {
+			oBindingType = oBinding.getType();
+		}
+
+		if (oBindingType && oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"])) {
+			return jQuery.extend({}, oBindingType.getFormatOptions());
+		}
+	};
+
+	/**
+	 * Gets the combined format options from both properties and binding for
+	 * formatting dates with timezones.
+	 * @param {boolean} bDisplayFormat Determines which formatter to create - for
+	 * the display or for the value property string
+	 * @returns {object} An object with DateFormat options
+	 * @private
+	 */
+	DateTimePicker.prototype._getTimezoneFormatOptions = function(bDisplayFormat) {
+		var oFormatOptions = this._getBindingWithTimezoneFormatOptions() || {},
+			sFormat = bDisplayFormat ? this.getDisplayFormat() : this.getValueFormat(),
+			oBinding = this.getBinding("value") || this.getBinding("dateValue"),
+			oBindingType = oBinding && oBinding.getType && oBinding.getType();
+
+		if (bDisplayFormat || !this._getTimezone()
+			|| (oBindingType && this._isSupportedBindingType(oBindingType))) {
+			oFormatOptions.showTimezone = DateFormatTimezoneDisplay.Hide;
+		}
+
+		if (oFormatOptions.relative === undefined) {
+			oFormatOptions.relative = false;
+		}
+
+		if (oFormatOptions.calendarType === undefined) {
+			oFormatOptions.calendarType = bDisplayFormat
+				? this.getDisplayFormatType()
+				: CalendarType.Gregorian;
+		}
+
+		if (oFormatOptions.strictParsing === undefined) {
+			oFormatOptions.strictParsing = true;
+		}
+
+		if (sFormat && (!oBinding || !oBindingType || !this._isSupportedBindingType(oBindingType))) {
+			oFormatOptions[this._checkStyle(sFormat) ? "style" : "pattern"] = sFormat;
+		}
+
+		return oFormatOptions;
+	};
+
+	/**
+	 * Returns the name of the cache property used for either the display formatter,
+	 * or the value formatter with timezone.
+	 * @private
+	*/
+	DateTimePicker.prototype._getTimezoneFormatterCacheName = function(bDisplayFormat) {
+		return bDisplayFormat ? "_oDisplayFormatWithTimezone" : "_oValueFormatWithTimezone";
+	};
+
+	/**
+	 * If the control should display a timezone label.
+	 * The property is with priority over the binding options.
+	 * @returns {boolean} Returns true, if the control should display a timezone
+	 * @private
+	 */
+	DateTimePicker.prototype._getShowTimezone = function() {
+		var oBinding = this.getBinding("value") || this.getBinding("dateValue"),
+			oBindingType = oBinding && oBinding.getType();
+
+		if (this.getShowTimezone() === undefined && oBindingType && oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"])) {
+			return oBindingType.getFormatOptions().showTimezone !== DateFormatTimezoneDisplay.Hide;
+		}
+
+		return this.getShowTimezone();
+	};
+
+	/**
+	 * Gets the timezone that will be used by the control.
+	 * The timezone property is with priority over the binding options.
+	 * @param {boolean} bUseDefaultAsFallback Whether to use the application default as a fallback.
+	 * @returns {string} The timezone IANA ID
+	 * @private
+	 */
+	DateTimePicker.prototype._getTimezone = function(bUseDefaultAsFallback) {
+		var oBinding = this.getBinding("value") || this.getBinding("dateValue"),
+			oBindingType = oBinding && oBinding.getType();
+
+		if (!this.getTimezone() && oBindingType
+			&& oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"])
+			&& oBinding.aValues[1]) {
+			return oBinding.aValues[1];
+		}
+
+		return this.getTimezone() || (bUseDefaultAsFallback && Core.getConfiguration().getTimezone());
 	};
 
 	DateTimePicker.prototype._checkStyle = function(sPattern){
@@ -464,33 +734,42 @@ sap.ui.define([
 
 	};
 
-	DateTimePicker.prototype._parseValue = function(sValue, bDisplayFormat) {
+	DateTimePicker.prototype._parseValue = function(sValue, bDisplayFormat, sTimezone) {
+		var oBinding = this.getBinding("value") || this.getBinding("dateValue"),
+			oBindingType = oBinding && oBinding.getType(),
+			aDateWithTimezone;
+
+		if (oBindingType) {
+			if (oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"])) {
+				var aCurrentBindingValues = oBinding.getCurrentValues().slice(0);
+				aCurrentBindingValues[1] = sTimezone || this._getTimezone(true);
+				return oBindingType.parseValue(sValue, "string", aCurrentBindingValues)[0];
+			} else if (!bDisplayFormat && this._isSupportedBindingType(oBindingType)) {
+				return DatePicker.prototype._parseValue.apply(this, arguments);
+			}
+		}
 
-		var oDate = DatePicker.prototype._parseValue.apply(this, arguments);
+		aDateWithTimezone = this._getFormatter(bDisplayFormat)
+			.parse(sValue, sTimezone || this._getTimezone(true));
 
-		if (bDisplayFormat && !oDate) {
-			// maybe only a date is entered
-			oDate = this._oDisplayFormatDate.parse(sValue);
-			if (oDate) {
-				// use time of existing date or current time
-				var oOldDate = this.getDateValue();
-				if (!oOldDate) {
-					oOldDate = new Date();
-				}
-				oDate.setHours(oOldDate.getHours());
-				oDate.setMinutes(oOldDate.getMinutes());
-				oDate.setSeconds(oOldDate.getSeconds());
-				oDate.setMilliseconds(oOldDate.getMilliseconds());
-			}
+		if (!aDateWithTimezone || !aDateWithTimezone.length) {
+			return null;
 		}
 
-		return oDate;
+		return aDateWithTimezone[0];
+	};
 
+	DateTimePicker.prototype._formatValue = function(oDate, bValueFormat, sTimezone) {
+		if (!oDate) {
+			return "";
+		}
+
+		return this._getFormatter(!bValueFormat).format(oDate, sTimezone || this._getTimezone(true));
 	};
 
 	DateTimePicker.prototype._getLocaleBasedPattern = function(sPlaceholder) {
 		var oLocaleData = LocaleData.getInstance(
-				sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale()
+				Core.getConfiguration().getFormatSettings().getFormatLocale()
 			),
 			iSlashIndex = sPlaceholder.indexOf("/");
 
@@ -507,7 +786,7 @@ sap.ui.define([
 		var sLabelId, sLabel, oResourceBundle, sOKButtonText, sCancelButtonText, oPopover;
 
 		if (!this._oPopup) {
-			oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+			oResourceBundle = Core.getLibraryResourceBundle("sap.m");
 			sOKButtonText = oResourceBundle.getText("TIMEPICKER_SET");
 			sCancelButtonText = oResourceBundle.getText("TIMEPICKER_CANCEL");
 
@@ -594,17 +873,23 @@ sap.ui.define([
 		}
 
 		if (!this._oClocks) {
-			this._oClocks = new sap.m.TimePickerClocks(this.getId() + "-Clocks", {
+			this._oClocks = new TimePickerClocks(this.getId() + "-Clocks", {
 				minutesStep: this.getMinutesStep(),
 				secondsStep: this.getSecondsStep(),
+				valueFormat: _getTimePattern.call(this),
 				displayFormat: _getTimePattern.call(this),
-				localeId: this.getLocaleId()
+				localeId: this.getLocaleId(),
+				showCurrentTimeButton: this.getShowCurrentTimeButton()
 			});
 			this._oPopupContent.setClocks(this._oClocks);
 		}
 
 	};
 
+	/* Override of the DatePicker method - this delegate is not needed in DateTimePicker */
+	DateTimePicker.prototype._attachAfterRenderingDelegate = function()	{
+	};
+
 	DateTimePicker.prototype._selectFocusedDateValue = function (oDateRange) {
 		var oCalendar = this._oCalendar;
 
@@ -617,7 +902,8 @@ sap.ui.define([
 	DateTimePicker.prototype._fillDateRange = function(){
 
 		var oDate = this.getDateValue(),
-			bDateFound = true;
+			bDateFound = true,
+			sFormattedDate;
 
 		if (oDate) {
 			oDate = new Date(oDate.getTime());
@@ -645,13 +931,15 @@ sap.ui.define([
 			}
 		}
 
+		sFormattedDate = this._formatValue(oDate, false);
+		oDate = this._parseValue(sFormattedDate, true, Core.getConfiguration().getTimezone());
 		this._oClocks._setTimeValues(oDate);
-
 	};
 
 	DateTimePicker.prototype._getSelectedDate = function(){
 
-		var oDate = DatePicker.prototype._getSelectedDate.apply(this, arguments);
+		var oDate = DatePicker.prototype._getSelectedDate.apply(this, arguments),
+			sFormattedDate;
 
 		if (oDate) {
 			var oDateTime = this._oClocks.getTimeValues();
@@ -673,13 +961,15 @@ sap.ui.define([
 			}
 		}
 
-		return oDate;
+		sFormattedDate = this._formatValue(oDate, false, Core.getConfiguration().getTimezone());
+		oDate = this._parseValue(sFormattedDate, true, this._getTimezone(true));
 
+		return oDate;
 	};
 
 	DateTimePicker.prototype.getLocaleId = function(){
 
-		return sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale().toString();
+		return Core.getConfiguration().getFormatSettings().getFormatLocale().toString();
 
 	};
 
@@ -690,7 +980,7 @@ sap.ui.define([
 	 */
 	DateTimePicker.prototype.getAccessibilityInfo = function() {
 		var oInfo = DatePicker.prototype.getAccessibilityInfo.apply(this, arguments);
-		oInfo.type = sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_DATETIMEINPUT");
+		oInfo.type = Core.getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_DATETIMEINPUT");
 		return oInfo;
 	};
 
@@ -763,7 +1053,7 @@ sap.ui.define([
 		}
 
 		if (sDisplayFormat == DateTimeFormatStyles.Short || sDisplayFormat == DateTimeFormatStyles.Medium || sDisplayFormat == DateTimeFormatStyles.Long || sDisplayFormat == DateTimeFormatStyles.Full) {
-			var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+			var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale();
 			var oLocaleData = LocaleData.getInstance(oLocale);
 			sTimePattern = oLocaleData.getTimePattern(sDisplayFormat);
 		} else {
@@ -775,12 +1065,15 @@ sap.ui.define([
 	}
 
 	function _handleCalendarSelect(oEvent) {
-		this._oPopupContent.getCalendar().getAggregation("month")[0].addEventDelegate({
+		var oDelegate = {
 			onAfterRendering: function () {
-				this._oOKButton.setEnabled(true);
+				this._oPopupContent.getCalendar().getAggregation("month")[0].removeEventDelegate(oDelegate, this);
 				this._oPopupContent.switchToTime();
+				this._oPopupContent.getClocks()._focusActiveButton();
 			}
-		}, this);
+		};
+		this._oOKButton.setEnabled(true);
+		this._oPopupContent.getCalendar().getAggregation("month")[0].addEventDelegate(oDelegate, this);
 	}
 
 	return DateTimePicker;