@openui5/sap.m 1.110.0 → 1.111.0

package/src/sap/m/DatePicker.js

@@ -9,8 +9,6 @@ sap.ui.define([
 	'sap/ui/thirdparty/jquery',
 	'sap/ui/Device',
 	"sap/ui/core/Element",
-	"sap/ui/core/format/TimezoneUtil",
-	"sap/ui/core/format/DateFormat",
 	'./InputBase',
 	'./DateTimeField',
 	'./Button',
@@ -34,6 +32,8 @@ sap.ui.define([
 	"sap/ui/core/LabelEnablement",
 	"sap/ui/unified/library",
 	"sap/ui/core/Configuration",
+	"sap/ui/unified/calendar/CalendarUtils",
+    'sap/ui/core/date/UI5Date',
 	"sap/ui/core/date/CalendarWeekNumbering",
 	"sap/ui/dom/jquery/cursorPos"
 ],
@@ -41,8 +41,6 @@ sap.ui.define([
 		jQuery,
 		Device,
 		Element,
-		TimezoneUtil,
-		DateFormat,
 		InputBase,
 		DateTimeField,
 		Button,
@@ -65,6 +63,8 @@ sap.ui.define([
 		LabelEnablement,
 		unifiedLibrary,
 		Configuration,
+		CalendarUtils,
+        UI5Date,
 		CalendarWeekNumbering
 	) {
 	"use strict";
@@ -154,7 +154,7 @@ sap.ui.define([
 	 * the close event), or select Cancel.
 	 *
 	 * @extends sap.m.DateTimeField
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -368,9 +368,9 @@ sap.ui.define([
 
 		this._bValid = true;
 
-		this._oMinDate = new Date(1, 0, 1); // set the date to minimum possible for that day
+		this._oMinDate = UI5Date.getInstance(1, 0, 1); // set the date to minimum possible for that day
 		this._oMinDate.setFullYear(1); // otherwise year 1 will be converted to year 1901
-		this._oMaxDate = new Date(9999, 11, 31, 23, 59, 59, 999); // set the date for the maximum possible for that day
+		this._oMaxDate = UI5Date.getInstance(9999, 11, 31, 23, 59, 59, 999); // set the date for the maximum possible for that day
 
 		var oIcon = this.addEndIcon({
 			id: this.getId() + "-icon",
@@ -707,7 +707,7 @@ sap.ui.define([
 				throw new Error("Date must be between 0001-01-01 and 9999-12-31; " + this);
 			}
 
-			this._oMinDate = new Date(oDate.getTime());
+			this._oMinDate = UI5Date.getInstance(oDate.getTime());
 			var oDateValue = this.getDateValue();
 			if (oDateValue && oDateValue.getTime() < oDate.getTime()) {
 				this._bValid = false;
@@ -715,7 +715,7 @@ sap.ui.define([
 				Log.warning("DateValue not in valid date range", this);
 			}
 		} else {
-			this._oMinDate = new Date(1, 0, 1);
+			this._oMinDate = UI5Date.getInstance(1, 0, 1);
 			this._oMinDate.setFullYear(1); // otherwise year 1 will be converted to year 1901
 		}
 
@@ -753,7 +753,7 @@ sap.ui.define([
 				throw new Error("Date must be between 0001-01-01 and 9999-12-31; " + this);
 			}
 
-			this._oMaxDate = new Date(oDate.getTime());
+			this._oMaxDate = UI5Date.getInstance(oDate.getTime());
 			var oDateValue = this.getDateValue();
 			if (oDateValue && oDateValue.getTime() > oDate.getTime()) {
 				this._bValid = false;
@@ -761,7 +761,7 @@ sap.ui.define([
 				Log.warning("DateValue not in valid date", this);
 			}
 		} else {
-			this._oMaxDate = new Date(9999, 11, 31, 23, 59, 59, 999);
+			this._oMaxDate = UI5Date.getInstance(9999, 11, 31, 23, 59, 59, 999);
 		}
 
 		// re-render because order of parameter changes not clear -> check onBeforeRendering
@@ -787,10 +787,10 @@ sap.ui.define([
 
 		if (this._oMinDate.getTime() > this._oMaxDate.getTime()) {
 			Log.warning("minDate > MaxDate -> dates switched", this);
-			var oMaxDate = new Date(this._oMinDate.getTime());
-			var oMinDate = new Date(this._oMaxDate.getTime());
-			this._oMinDate = new Date(oMinDate.getTime());
-			this._oMaxDate = new Date(oMaxDate.getTime());
+			var oMaxDate = UI5Date.getInstance(this._oMinDate.getTime());
+			var oMinDate = UI5Date.getInstance(this._oMaxDate.getTime());
+			this._oMinDate = UI5Date.getInstance(oMinDate.getTime());
+			this._oMaxDate = UI5Date.getInstance(oMaxDate.getTime());
 			this.setProperty("minDate", oMinDate, true);
 			this.setProperty("maxDate", oMaxDate, true);
 			if (this._getCalendar()) {
@@ -1073,7 +1073,7 @@ sap.ui.define([
 				this._getCalendar().focusDate(oDate);
 				var oStartDate = this._oDateRange.getStartDate();
 				if ((!oStartDate && oDate) || (oStartDate && oDate && oStartDate.getTime() != oDate.getTime())) {
-					this._oDateRange.setStartDate(new Date(oDate.getTime()));
+					this._oDateRange.setStartDate(UI5Date.getInstance(oDate.getTime()));
 				} else if (oStartDate && !oDate) {
 					this._oDateRange.setStartDate(undefined);
 				}
@@ -1352,32 +1352,19 @@ sap.ui.define([
 	};
 
 	DatePicker.prototype._fillDateRange = function(){
-		var sFormattedDate;
 		var oDate = this.getDateValue();
 
 		if (oDate &&
 			oDate.getTime() >= this._oMinDate.getTime() &&
 			oDate.getTime() <= this._oMaxDate.getTime()) {
 
-			sFormattedDate = this._getPickerParser().format(
-				oDate,
-				this._getTimezone(true)
-			);
-			oDate = this._getPickerParser().parse(sFormattedDate, TimezoneUtil.getLocalTimezone())[0];
-
-			this._getCalendar().focusDate(new Date(oDate.getTime()));
+			this._getCalendar().focusDate(UI5Date.getInstance(oDate.getTime()));
 			if (!this._oDateRange.getStartDate() || this._oDateRange.getStartDate().getTime() != oDate.getTime()) {
-				this._oDateRange.setStartDate(new Date(oDate.getTime()));
+				this._oDateRange.setStartDate(UI5Date.getInstance(oDate.getTime()));
 			}
 		} else {
 			var oInitialFocusedDateValue = this.getInitialFocusedDateValue();
-			var oFocusDate = oInitialFocusedDateValue ? oInitialFocusedDateValue : new Date();
-
-			sFormattedDate = this._getPickerParser().format(
-				oFocusDate,
-				this._getTimezone(true)
-			);
-			oFocusDate = this._getPickerParser().parse(sFormattedDate, TimezoneUtil.getLocalTimezone())[0];
+			var oFocusDate = oInitialFocusedDateValue ? oInitialFocusedDateValue : UI5Date.getInstance();
 
 			if (oFocusDate.getTime() < this._oMinDate.getTime()) {
 				oFocusDate = this._oMinDate;
@@ -1418,16 +1405,9 @@ sap.ui.define([
 			oDate = this._getSelectedDate(),
 			sValue = "";
 
-		var sFormattedDate = this._getPickerParser().format(oDate, TimezoneUtil.getLocalTimezone());
-		var oParts = this._getPickerParser().parse(
-			sFormattedDate,
-			this._getTimezone(true)
-		);
-		oDate = oParts && oParts[0];
-
 		// do not use this.onChange() because output pattern will change date (e.g. only last 2 number of year -> 1966 -> 2066 )
 		if (!deepEqual(oDate, oDateOld)) {
-			this.setDateValue(new Date(oDate.getTime()));
+			this.setDateValue(UI5Date.getInstance(oDate.getTime()));
 			// compare Dates because value can be the same if only 2 digits for year
 			sValue = this.getValue();
 			this.fireChangeEvent(sValue, {valid: true});
@@ -1552,8 +1532,8 @@ sap.ui.define([
 				sCalendarType = this.getDisplayFormatType();
 			}
 
-			var oDate = UniversalDate.getInstance(new Date(oOldDate.getTime()), sCalendarType);
-			oOldDate = UniversalDate.getInstance(new Date(oOldDate.getTime()), sCalendarType);
+			var oDate = UniversalDate.getInstance(UI5Date.getInstance(oOldDate.getTime()), sCalendarType);
+			oOldDate = UniversalDate.getInstance(UI5Date.getInstance(oOldDate.getTime()), sCalendarType);
 
 			switch (sUnit) {
 			case "day":
@@ -1589,7 +1569,7 @@ sap.ui.define([
 			}
 
 			if (!deepEqual(this.getDateValue(), oDate.getJSDate())) {
-				this.setDateValue(new Date(oDate.getTime()));
+				this.setDateValue(UI5Date.getInstance(oDate.getTime()));
 
 				this._curpos = iCurpos;
 				this._$input.cursorPos(this._curpos);
@@ -1677,14 +1657,6 @@ sap.ui.define([
 
 	}
 
-	DatePicker.prototype._getPickerParser = function() {
-		if (!this._calendarParser) {
-			this._calendarParser = DateFormat.getDateTimeWithTimezoneInstance({ showTimezone: false });
-		}
-
-		return this._calendarParser;
-	};
-
 	/**
 	 * Fired when the input operation has finished and the value has changed.
 	 *

package/src/sap/m/DateRangeSelection.js

@@ -11,7 +11,6 @@ sap.ui.define([
 	'./library',
 	'sap/ui/core/LocaleData',
 	'sap/ui/core/format/DateFormat',
-	'sap/ui/core/format/TimezoneUtil',
 	'sap/ui/core/date/UniversalDate',
 	'./DateRangeSelectionRenderer',
 	"sap/ui/unified/calendar/CustomMonthPicker",
@@ -20,7 +19,9 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/assert",
 	"sap/ui/core/Configuration",
-	"sap/ui/dom/jquery/cursorPos" // jQuery Plugin "cursorPos"
+	"sap/ui/core/date/UI5Date",
+	// jQuery Plugin "cursorPos"
+	"sap/ui/dom/jquery/cursorPos"
 ],
 	function(
 		Device,
@@ -28,7 +29,6 @@ sap.ui.define([
 		library,
 		LocaleData,
 		DateFormat,
-		TimezoneUtil,
 		UniversalDate,
 		DateRangeSelectionRenderer,
 		CustomMonthPicker,
@@ -36,7 +36,8 @@ sap.ui.define([
 		deepEqual,
 		Log,
 		assert,
-		Configuration
+		Configuration,
+		UI5Date
 	) {
 	"use strict";
 
@@ -130,8 +131,8 @@ sap.ui.define([
 	 * compact mode and provides a touch-friendly size in cozy mode.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.110.0
-	 * @version 1.110.0
+	 * @version 1.111.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -365,7 +366,7 @@ sap.ui.define([
 	 * @private
 	 */
 	function _normalizeDateValue(vBindingDate) {
-		return (typeof vBindingDate === 'number') ? new Date(vBindingDate) : vBindingDate;
+		return (typeof vBindingDate === 'number') ? UI5Date.getInstance(vBindingDate) : vBindingDate;
 	}
 
 	/**
@@ -410,6 +411,13 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Sets the displayFormat of the DatePicker.
+	 *
+	 * @param {string} sDisplayFormat  new value for <code>displayFormat</code>
+	 * @returns {this} Reference to <code>this</code> for method chaining
+	 * @public
+	 */
 	DateRangeSelection.prototype.setDisplayFormat = function(sDisplayFormat) {
 
 		// if displayFormat changes the value must be formatted again
@@ -493,6 +501,19 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Getter for property <code>secondDateValue</code>.
+	 *
+	 * The end date of the range as JavaScript Date object. This is independent from any formatter.
+	 *
+	 * <b>Note:</b> If this property is used, the <code>value</code> property should not be changed from the caller.
+	 *
+	 * @returns {Date} the value of property <code>secondDateValue</code>
+	 * @public
+	 * @name sap.m.DateRangeSelection#getSecondDateValue
+	 * @function
+	 */
+
 	/**
 	 * Setter for property <code>secondDateValue</code>.
 	 *
@@ -527,6 +548,11 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+	 * Set minimum date that can be shown and selected in the <code>DatePicker</code>. This must be a JavaScript date object.
+	 * @param {Date} oDate A JavaScript Date
+	 * @returns {this} Reference to <code>this</code> for method chaining
+	 */
 	DateRangeSelection.prototype.setMinDate = function(oDate) {
 
 		DatePicker.prototype.setMinDate.apply(this, arguments);
@@ -542,6 +568,11 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Set maximum date that can be shown and selected in the <code>DatePicker</code>. This must be a JavaScript date object.
+	 * @param {Date} oDate A JavaScript Date
+	 * @returns {this} Reference to <code>this</code> for method chaining
+	 */
 	DateRangeSelection.prototype.setMaxDate = function(oDate) {
 
 		DatePicker.prototype.setMaxDate.apply(this, arguments);
@@ -771,7 +802,7 @@ sap.ui.define([
 				var oStartDate = this.getDateValue();
 				if (oStartDate) {
 					if (!this._oDateRange.getStartDate() || this._oDateRange.getStartDate().getTime() !== oStartDate.getTime()) {
-						this._oDateRange.setStartDate(new Date(oStartDate.getTime()));
+						this._oDateRange.setStartDate(UI5Date.getInstance(oStartDate.getTime()));
 						this._getCalendar().focusDate(oStartDate);
 					}
 				} else {
@@ -783,7 +814,7 @@ sap.ui.define([
 				var oEndDate = this.getSecondDateValue();
 				if (oEndDate) {
 					if (!this._oDateRange.getEndDate() || this._oDateRange.getEndDate().getTime() !== oEndDate.getTime()) {
-						this._oDateRange.setEndDate(new Date(oEndDate.getTime()));
+						this._oDateRange.setEndDate(UI5Date.getInstance(oEndDate.getTime()));
 						this._getCalendar().focusDate(oEndDate);
 					}
 				} else {
@@ -833,19 +864,13 @@ sap.ui.define([
 		DatePicker.prototype._fillDateRange.apply(this, arguments);
 
 		var oEndDate = this.getSecondDateValue();
-		var sFormattedEndDate;
 
 		if (oEndDate &&
 			oEndDate.getTime() >= this._oMinDate.getTime() &&
 			oEndDate.getTime() <= this._oMaxDate.getTime()) {
 			if (!this._oDateRange.getEndDate() || this._oDateRange.getEndDate().getTime() !== oEndDate.getTime()) {
-				sFormattedEndDate = this._getPickerParser().format(
-					oEndDate,
-					Configuration.getTimezone()
-				);
-				oEndDate = this._getPickerParser().parse(sFormattedEndDate, TimezoneUtil.getLocalTimezone())[0];
 
-				this._oDateRange.setEndDate(new Date(oEndDate.getTime()));
+				this._oDateRange.setEndDate(UI5Date.getInstance(oEndDate.getTime()));
 			}
 		} else {
 			if (this._oDateRange.getEndDate()) {
@@ -857,8 +882,6 @@ sap.ui.define([
 
 	DateRangeSelection.prototype._selectDate = function () {
 		var aSelectedDates = this._getCalendar().getSelectedDates();
-		var sFormattedDate, oParts;
-		var sTimezone = Configuration.getTimezone();
 
 		if (aSelectedDates.length > 0) {
 			var oDate1 = aSelectedDates[0].getStartDate();
@@ -871,17 +894,6 @@ sap.ui.define([
 				// the selected range includes all of the hours from the second date
 				oDate2.setHours(23, 59, 59, 999);
 
-				sFormattedDate = this._getPickerParser().format(oDate1, TimezoneUtil.getLocalTimezone());
-				oParts = this._getPickerParser().parse(sFormattedDate, sTimezone);
-				oDate1 = oParts && oParts[0];
-
-				sFormattedDate = this._getPickerParser().format(oDate2, TimezoneUtil.getLocalTimezone());
-				oParts = this._getPickerParser().parse(sFormattedDate, sTimezone);
-				oDate2 = oParts && oParts[0];
-
-				//the parser does not include milliseconds, so restore them
-				oDate2.setMilliseconds(999);
-
 				var sValue;
 				if (!deepEqual(oDate1, oDate1Old) || !deepEqual(oDate2, oDate2Old)) {
 					// compare Dates because value can be the same if only 2 digits for year
@@ -934,16 +946,13 @@ sap.ui.define([
 
 	DateRangeSelection.prototype._handleWeekSelect = function(oEvent){
 		var oSelectedDates = oEvent.getParameter("weekDays"),
-			oSelectedStartDate,
-			oSelectedEndDate;
+			oSelectedStartDate = oSelectedDates.getStartDate(),
+			oSelectedEndDate = oSelectedDates.getEndDate();
 
 		if (!oSelectedDates) {
 			return;
 		}
 
-		oSelectedStartDate = oSelectedDates.getStartDate();
-		oSelectedEndDate = oSelectedDates.getEndDate();
-
 		if (this.getShowFooter()) {
 			this._oPopup.getBeginButton().setEnabled(!!(oSelectedStartDate && oSelectedEndDate));
 			return;
@@ -1092,7 +1101,7 @@ sap.ui.define([
 			oDate = _getIncrementedDate.call(this, oFirstOldDate, iNumber, sUnit);
 
 			if (!deepEqual(this.getDateValue(), oDate.getJSDate())) {
-				this.setDateValue(new Date(oDate.getTime()));
+				this.setDateValue(UI5Date.getInstance(oDate.getTime()));
 				this._curpos = iCurPos;
 				this._$input.cursorPos(this._curpos);
 
@@ -1102,7 +1111,7 @@ sap.ui.define([
 			oDate = _getIncrementedDate.call(this, oSecondOldDate, iNumber, sUnit);
 
 			if (!deepEqual(this.getSecondDateValue(), oDate.getJSDate())) {
-				this.setSecondDateValue(new Date(oDate.getTime()));
+				this.setSecondDateValue(UI5Date.getInstance(oDate.getTime()));
 				this._curpos = iCurPos;
 				this._$input.cursorPos(this._curpos);
 
@@ -1111,14 +1120,6 @@ sap.ui.define([
 		}
 	};
 
-	DateRangeSelection.prototype._getPickerParser = function() {
-		if (!this._calendarParser) {
-			this._calendarParser = DateFormat.getDateTimeWithTimezoneInstance({ showTimezone: false });
-		}
-
-		return this._calendarParser;
-	};
-
 	function _getIncrementedDate(oOldDate, iNumber, sUnit) {
 		// use UniversalDate to calculate new date based on used calendar
 		var oBinding = this.getBinding("value"),
@@ -1137,7 +1138,7 @@ sap.ui.define([
 			sCalendarType = this.getDisplayFormatType();
 		}
 
-		oUTCDate = UniversalDate.getInstance(new Date(oOldDate.getTime()), sCalendarType);
+		oUTCDate = UniversalDate.getInstance(UI5Date.getInstance(oOldDate.getTime()), sCalendarType);
 		iOldDateMonth = oUTCDate.getMonth();
 
 		switch (sUnit) {

package/src/sap/m/DateTimeField.js

@@ -20,6 +20,8 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/Configuration",
+	'sap/ui/core/date/UI5Date',
+	'sap/ui/unified/calendar/CalendarUtils',
 	// jQuery Plugin "cursorPos"
 	"sap/ui/dom/jquery/cursorPos"
 ], function(
@@ -36,7 +38,9 @@ sap.ui.define([
 	deepEqual,
 	Log,
 	jQuery,
-	Configuration
+	Configuration,
+	UI5Date,
+	CalendarUtils
 ) {
 	"use strict";
 
@@ -61,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -138,7 +142,6 @@ sap.ui.define([
 	});
 
 	DateTimeField.prototype.setValue = function (sValue) {
-
 		sValue = this.validateProperty("value", sValue); // to convert null and undefined to ""
 
 		var sOldValue = this.getValue();
@@ -380,14 +383,6 @@ sap.ui.define([
 		).getDatePattern(sPlaceholder);
 	};
 
-	DateTimeField.prototype._getTimezoneFormatter = function() {
-		if (!this._timezoneFormatter) {
-			this._timezoneFormatter = DateFormat.getDateTimeWithTimezoneInstance({ showTimezone: false });
-		}
-
-		return this._timezoneFormatter;
-	};
-
 	DateTimeField.prototype._parseValue = function (sValue, bDisplayFormat) {
 		var oBinding = this.getBinding("value"),
 			oBindingType = oBinding && oBinding.getType && oBinding.getType(),
@@ -396,8 +391,7 @@ sap.ui.define([
 			oFormatter = this._getFormatter(bDisplayFormat),
 			oFormatOptions,
 			oDateLocal,
-			oDate,
-			sFormatted;
+			oDate;
 
 		if (this._isSupportedBindingType(oBindingType)) {
 			try {
@@ -410,7 +404,7 @@ sap.ui.define([
 				oFormatOptions = oBindingType.oFormatOptions;
 				if (oFormatOptions && oFormatOptions.source && oFormatOptions.source.pattern == "timestamp") {
 					// convert timestamp back to Date
-					oDate = new Date(oDate);
+					oDate = UI5Date.getInstance(oDate);
 				} else if (oFormatOptions && oFormatOptions.source && typeof oFormatOptions.source.pattern === "string") {
 					oDate = oBindingType.oInputFormat.parse(sValue);
 				}
@@ -420,10 +414,10 @@ sap.ui.define([
 
 			if (oDate && ((oBindingType.oFormatOptions && this._isFormatOptionsUTC(oBindingType.oFormatOptions)) || (oBindingType.oConstraints && oBindingType.oConstraints.isDateOnly))) {
 				// convert to local date because it was parsed as UTC date
-				sFormatted = this._getTimezoneFormatter().format(oDate, "UTC");
-				oDateLocal = this._getTimezoneFormatter().parse(sFormatted,
-					Configuration.getTimezone())[0];
+				oDateLocal = UI5Date.getInstance(oDate.getUTCFullYear(), oDate.getUTCMonth(), oDate.getUTCDate(),
+					oDate.getUTCHours(), oDate.getUTCMinutes(), oDate.getUTCSeconds(), oDate.getUTCMilliseconds());
 
+				oDateLocal.setFullYear(oDate.getUTCFullYear());
 				oDate = oDateLocal;
 			}
 			return oDate;
@@ -441,15 +435,14 @@ sap.ui.define([
 		var oBinding = this.getBinding("value"),
 			oBindingType = oBinding && oBinding.getType && oBinding.getType(),
 			oFormatOptions,
-			oDateUTC,
-			sFormatted;
+			oDateUTC;
 
 		if (this._isSupportedBindingType(oBindingType)) {
 			if ((oBindingType.oFormatOptions && oBindingType.oFormatOptions.UTC) || (oBindingType.oConstraints && oBindingType.oConstraints.isDateOnly)) {
 				// convert to UTC date because it will be formatted as UTC date
-				sFormatted = this._getTimezoneFormatter().format(oDate, Configuration.getTimezone());
-				oDateUTC = this._getTimezoneFormatter().parse(sFormatted, "UTC")[ 0 ];
+				oDateUTC = CalendarUtils._createUTCDate(oDate, true);
 
+				oDateUTC.setUTCFullYear(oDate.getFullYear());
 				oDate = oDateUTC;
 			}
 

package/src/sap/m/DateTimeInput.js

@@ -64,7 +64,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public