@openui5/sap.m 1.98.0 → 1.101.0

package/src/sap/m/DateTimePicker.js

@@ -12,10 +12,13 @@ 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/LocaleData',
+	'sap/ui/core/Core',
+	'sap/ui/core/format/TimezoneUtil',
 	'./TimePickerClocks',
 	'./DateTimePickerRenderer',
 	'./SegmentedButton',
@@ -23,7 +26,8 @@ sap.ui.define([
 	'./ResponsivePopover',
 	'./Button',
 	"sap/ui/events/KeyCodes",
-	"sap/ui/core/IconPool"
+	"sap/ui/core/IconPool",
+	"sap/ui/qunit/utils/waitForThemeApplied"
 ], function(
 	jQuery,
 	InputBase,
@@ -31,10 +35,13 @@ sap.ui.define([
 	Date1,
 	DateRange,
 	library,
+	coreLibrary,
 	Control,
 	Device,
 	DateFormat,
 	LocaleData,
+	Core,
+	TimezoneUtil,
 	TimePickerClocks,
 	DateTimePickerRenderer,
 	SegmentedButton,
@@ -42,15 +49,17 @@ sap.ui.define([
 	ResponsivePopover,
 	Button,
 	KeyCodes,
-	IconPool
+	IconPool,
+	waitForThemeApplied
 ) {
 	"use strict";
 
 	// shortcut for sap.m.PlacementType and sap.m.ButtonType
 	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";
+		// From Device.media.RANGESETS.SAP_STANDARD - "Phone": For screens smaller than 600 pixels.
+		STANDART_PHONE_RANGESET = "Phone",
+		CalendarType = coreLibrary.CalendarType;
 
 	/**
 	 * Constructor for a new <code>DateTimePicker</code>.
@@ -136,7 +145,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -168,10 +177,52 @@ sap.ui.define([
 			 *
 			 * @since 1.98
 			 */
-			showCurrentTimeButton : {type : "boolean", group : "Behavior", defaultValue : false}
+			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 = {
@@ -185,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},
@@ -208,7 +263,6 @@ sap.ui.define([
 					oRm.openEnd();
 					oRm.renderControl(oSwitcher);
 					oRm.close("div");
-
 				}
 
 				var oCalendar = oPopup.getCalendar();
@@ -239,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");
 
@@ -256,23 +310,17 @@ 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");
+				this.getCalendar().addDelegate({
+					onAfterRendering: function() {
+						this._switchVisibility(oSwitcher.getSelectedKey());
+					}.bind(this)
+				});
 			} else {
 				oSwitcher.setVisible(false);
 			}
-
-		},
-
-		onAfterRendering: function() {
-
-			if (Device.system.phone || jQuery('html').hasClass("sapUiMedia-Std-Phone")) {
-				var oSwitcher = this.getAggregation("_switcher");
-				var sKey = oSwitcher.getSelectedKey();
-				this._switchVisibility(sKey);
-			}
-
 		},
 
 		_handleSelect: function(oEvent) {
@@ -296,7 +344,7 @@ sap.ui.define([
 			}
 
 			if (sKey === "Cal") {
-				oCalendar.$().css("display", "");
+				oCalendar.$().css("display", "flex");
 				oClocks.$().css("display", "none");
 				oCalendar.getFocusDomRef() && oCalendar.getFocusDomRef().focus();
 			} else {
@@ -319,21 +367,7 @@ sap.ui.define([
 		getSpecialDates: function() {
 
 			return this._oDateTimePicker.getSpecialDates();
-		},
 
-		onkeydown: function(oEvent) {
-			var bIsTabForward = oEvent.keyCode === KeyCodes.TAB && !oEvent.shiftKey;
-			var bIsTabBackward = oEvent.keyCode === KeyCodes.TAB && oEvent.shiftKey;
-			if (bIsTabForward) {
-				if (oEvent.target.classList.contains('sapUiCalHeadToday')
-					|| (oEvent.target.classList.contains('sapUiCalHeadBLast') && !this._oDateTimePicker._oCalendar.getShowCurrentDateButton())) {
-					this.getAggregation('clocks').getDomRef().children[0].children[0].focus();
-				}
-			}
-			if (bIsTabBackward && oEvent.target.classList.contains('sapUiCalItem')) {
-				var iLastElementIndex = this.oParent.getAggregation("footer").getAggregation("content").length - 1;
-				this.oParent.getAggregation("footer").getAggregation("content")[iLastElementIndex].focus();
-			}
 		}
 	});
 
@@ -343,6 +377,89 @@ sap.ui.define([
 		this._bOnlyCalendar = false;
 	};
 
+	DateTimePicker.prototype.setValue = function(sValue) {
+		var sFallbackValue;
+
+		DatePicker.prototype.setValue.apply(this, arguments);
+
+		delete this._prefferedValue;
+
+		if (!this.getDateValue()) {
+			sFallbackValue = this._fallbackParse(sValue);
+
+			if (typeof sFallbackValue === "string") {
+				this._bValid = true;
+				this._prefferedValue = sFallbackValue;
+
+				// there is a re-render comming, but this updates the dom immediately to avoid flickering
+				if (this.getDomRef() && this._$input.val() !== sFallbackValue) {
+					this._$input.val(sFallbackValue);
+					this._curpos = this._$input.cursorPos();
+				}
+			}
+		}
+
+		return this;
+	};
+
+	DateTimePicker.prototype.setTimezone = function(sTimezone) {
+		var oCurrentDateValue,
+			sFormattedValue,
+			oNewDateValue;
+
+		if (this.getTimezone() === sTimezone) {
+			return this;
+		}
+
+		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
@@ -360,12 +477,13 @@ 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) {
@@ -377,6 +495,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);
@@ -431,30 +554,160 @@ sap.ui.define([
 		return this.setProperty("showCurrentTimeButton", bShow);
 	};
 
-	DateTimePicker.prototype._getFormatInstance = function(oArguments, bDisplayFormat){
+	DateTimePicker.prototype._getTimezoneNamePopup = function() {
+		var oResourceBundle;
 
-		var oMyArguments = jQuery.extend({}, oArguments);
+		if (this._oTimezonePopup) {
+			this._oTimezonePopup.setTitle(this._getTimezone(true));
+			return this._oTimezonePopup;
+		}
+
+		this._oTimezonePopup = new ResponsivePopover({
+			showArrow: false,
+			placement: PlacementType.VerticalPreferredBottom,
+			offsetX: 0,
+			offsetY: 3,
+			horizontalScrolling: false,
+			title: this._getTimezone(true)
+		});
+
+		this.addDependent(this._oTimezonePopup);
 
-		// check for mixed styles
-		var iSlashIndex = -1;
+		if (Device.system.phone) {
+			oResourceBundle = Core.getLibraryResourceBundle("sap.m");
 
-		if (oMyArguments.style) {
-			iSlashIndex = oMyArguments.style.indexOf("/");
+			this._oTimezonePopup.setEndButton(new Button({
+				text: oResourceBundle.getText("SUGGESTIONSPOPOVER_CLOSE_BUTTON"),
+				type: ButtonType.Emphasized,
+				press: function () {
+					this._oTimezonePopup.close();
+				}.bind(this)
+			}));
 		}
 
-		if (bDisplayFormat) {
-			// also create a date formatter as fallback for parsing
-			var oDateArguments = jQuery.extend({}, oMyArguments);
+		return this._oTimezonePopup;
+	};
 
-			if (iSlashIndex > 0) {
-				oDateArguments.style = oDateArguments.style.substr(0, iSlashIndex);
-			}
+	DateTimePicker.prototype._togglePopoverOpen = function(oPopover, oOpenerDomRef) {
+		if (oPopover.isOpen()) {
+			oPopover.close();
+		} else {
+			oPopover.openBy(oOpenerDomRef || this.getDomRef());
+		}
+	};
 
-			this._oDisplayFormatDate = DateFormat.getInstance(oDateArguments);
+	DateTimePicker.prototype._getFormatter = function(bDisplayFormat) {
+		var sCacheName = this._getTimezoneFormatterCacheName(bDisplayFormat);
+
+		if (!this[sCacheName]) {
+			this[sCacheName] = DateFormat.getDateTimeWithTimezoneInstance(this._getTimezoneFormatOptions(bDisplayFormat));
+		}
+
+		return this[sCacheName];
+	};
+
+	/**
+	 * Gets the format options of the value or dateValue binding.
+	 * @returns {object} The binding format options or undefined.
+	 * @private
+	 */
+	DateTimePicker.prototype._getBindingFormatOptions = function() {
+		var oBinding = this.getBinding("value") || this.getBinding("dateValue"),
+			oBindingType;
+
+		if (oBinding) {
+			oBindingType = oBinding.getType();
+		}
+
+		if (this._isSupportedBindingType(oBindingType)) {
+			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._getBindingFormatOptions() || {},
+			sFormat = bDisplayFormat ? this.getDisplayFormat() : this.getValueFormat(),
+			oBinding = this.getBinding("value") || this.getBinding("dateValue"),
+			oBindingType = oBinding && oBinding.getType && oBinding.getType();
+
+		if (bDisplayFormat || !this._getTimezone() ||
+			(oBindingType && !oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"]))) {
+			oFormatOptions.showTimezone = false;
+		}
+
+		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;
 		}
 
-		return DateFormat.getDateTimeInstance(oMyArguments);
+		if (sFormat && !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 !== false;
+		}
 
+		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){
@@ -491,33 +744,68 @@ 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;
 
-		var oDate = DatePicker.prototype._parseValue.apply(this, arguments);
+		if (oBindingType && 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];
+		}
 
-		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());
-			}
+		aDateWithTimezone = this._getFormatter(bDisplayFormat)
+			.parse(sValue, sTimezone || this._getTimezone(true));
+
+		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));
+	};
+
+	/**
+	 * Tries to parse the value to see if it is a timezone only string.
+	 * @param {string} sValue A value string
+	 * @return {string|null} An empty string indicating success or null
+	 * @private
+	 */
+	DateTimePicker.prototype._fallbackParse = function(sValue) {
+		return this._getFallbackParser().parse(sValue) ? "" : null;
+	};
+
+	DateTimePicker.prototype._getFallbackParser = function() {
+		if (!this._fallbackParser) {
+			this._fallbackParser = DateFormat.getDateTimeWithTimezoneInstance({
+				showDate: false,
+				showTime: false,
+				showTimezone: true
+			});
+		}
+
+		return this._fallbackParser;
+	};
+
+	DateTimePicker.prototype._getPickerParser = function() {
+		if (!this._clocksParser) {
+			this._clocksParser = DateFormat.getDateTimeWithTimezoneInstance({ showTimezone: false });
+		}
+
+		return this._clocksParser;
 	};
 
 	DateTimePicker.prototype._getLocaleBasedPattern = function(sPlaceholder) {
 		var oLocaleData = LocaleData.getInstance(
-				sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale()
+				Core.getConfiguration().getFormatSettings().getFormatLocale()
 			),
 			iSlashIndex = sPlaceholder.indexOf("/");
 
@@ -534,7 +822,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");
 
@@ -650,7 +938,8 @@ sap.ui.define([
 	DateTimePicker.prototype._fillDateRange = function(){
 
 		var oDate = this.getDateValue(),
-			bDateFound = true;
+			bDateFound = true,
+			sFormattedDate;
 
 		if (oDate) {
 			oDate = new Date(oDate.getTime());
@@ -670,6 +959,10 @@ sap.ui.define([
 			this._oOKButton.setEnabled(false);
 		}
 
+		// convert the date to local date for the calendar and the clocks
+		sFormattedDate = this._getPickerParser().format(oDate, this._getTimezone(true));
+		oDate = this._getPickerParser().parse(sFormattedDate, TimezoneUtil.getLocalTimezone())[0];
+
 		this._oCalendar.focusDate(oDate);
 
 		if (bDateFound) {
@@ -679,14 +972,16 @@ sap.ui.define([
 		}
 
 		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) {
+			sFormattedDate = this._getPickerParser().format(oDate, TimezoneUtil.getLocalTimezone());
+			oDate = this._getPickerParser().parse(sFormattedDate, this._getTimezone(true))[0];
+
 			var oDateTime = this._oClocks.getTimeValues();
 			var sPattern = this._oClocks._getDisplayFormatPattern();
 			if (sPattern.search("h") >= 0 || sPattern.search("H") >= 0) {
@@ -707,12 +1002,11 @@ sap.ui.define([
 		}
 
 		return oDate;
-
 	};
 
 	DateTimePicker.prototype.getLocaleId = function(){
 
-		return sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale().toString();
+		return Core.getConfiguration().getFormatSettings().getFormatLocale().toString();
 
 	};
 
@@ -723,7 +1017,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;
 	};
 
@@ -753,12 +1047,11 @@ sap.ui.define([
 		} else {
 			oSwitcher.setVisible(false);
 			oClocks.$().css("display", "");
-			oCalendar.$().css("display", "");
+			oCalendar.$().css("display", "flex");
 		}
 	};
 
 	function _handleAfterOpen(oEvent){
-		this.$("inner").attr("aria-expanded", true);
 		this._oCalendar.focus();
 
 		Device.media.attachHandler(this._handleWindowResize, this);
@@ -766,7 +1059,6 @@ sap.ui.define([
 
 	function _handleAfterClose(){
 		this.removeStyleClass(InputBase.ICON_PRESSED_CSS_CLASS);
-		this.$("inner").attr("aria-expanded", false);
 
 		this._oCalendar._closePickers();
 		Device.media.detachHandler(this._handleWindowResize, this);
@@ -796,7 +1088,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 {
@@ -808,15 +1100,9 @@ sap.ui.define([
 	}
 
 	function _handleCalendarSelect(oEvent) {
-		var oDelegate = {
-			onAfterRendering: function () {
-				this._oPopupContent.getCalendar().getAggregation("month")[0].removeEventDelegate(oDelegate, this);
-				this._oOKButton.setEnabled(true);
-				this._oPopupContent.switchToTime();
-				this._oPopupContent.getClocks()._focusActiveButton();
-			}
-		};
-		this._oPopupContent.getCalendar().getAggregation("month")[0].addEventDelegate(oDelegate, this);
+		this._oPopupContent.switchToTime();
+		this._oPopupContent.getClocks()._focusActiveButton();
+		this._oOKButton.setEnabled(true);
 	}
 
 	return DateTimePicker;