@openui5/sap.m 1.103.0 → 1.105.0

package/src/sap/m/DateRangeSelection.js

@@ -128,8 +128,8 @@ sap.ui.define([
 	 * compact mode and provides a touch-friendly size in cozy mode.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.103.0
-	 * @version 1.103.0
+	 * @version 1.105.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public
@@ -297,14 +297,26 @@ sap.ui.define([
 	 * @public
 	 */
 	DateRangeSelection.prototype.setValue = function(sValue) {
+		sValue = this.validateProperty("value", sValue);
 
 		if (sValue !== this.getValue()) {
 			this.setLastValue(sValue);
 		} else {
 			return this;
 		}
-		// Set the property in any case but check validity on output
-		this.setProperty("value", sValue);
+
+		var aDates = this._parseAndValidateValue(sValue);
+		this.setProperty("dateValue", _normalizeDateValue(aDates[0]), this._bPreferUserInteraction);
+		this.setProperty("secondDateValue", _normalizeDateValue(aDates[1]), this._bPreferUserInteraction);
+
+		this._formatValueAndUpdateOutput(aDates);
+		this.setProperty("value", sValue, this._bPreferUserInteraction);
+
+		return this;
+
+	};
+
+	DateRangeSelection.prototype._parseAndValidateValue = function(sValue) {
 		this._bValid = true;
 
 		// Convert to date object(s)
@@ -318,22 +330,27 @@ sap.ui.define([
 			}
 		}
 
-		this.setProperty("dateValue", _normalizeDateValue(aDates[0]));
-		this.setProperty("secondDateValue", _normalizeDateValue(aDates[1]));
-
-		// Do not call InputBase.setValue because the displayed value and the output value might have different pattern
-		if (this.getDomRef()) {
-			// Convert to output
-			var sOutputValue = this._formatValue(aDates[0], aDates[1]);
+		return aDates;
+	};
 
-			if (this._$input.val() !== sOutputValue) {
-				this._$input.val(sOutputValue);
-				this._curpos = this._$input.cursorPos();
-			}
+	DateRangeSelection.prototype._formatValueAndUpdateOutput = function(aDates) {
+		if (!this.getDomRef()) {
+			return;
 		}
 
-		return this;
+		// Convert to output
+		var sOutputValue = this._formatValue(aDates[0], aDates[1]);
 
+		if (this._bPreferUserInteraction) {
+			// Handle the value concurrency before setting the value property of the control,
+			// in order to distinguish whether the user only focused the input field or typed in it
+			this.handleInputValueConcurrency(sOutputValue);
+		} else if (this._$input.val() !== sOutputValue) {
+			// update the DOM value when necessary
+			// otherwise cursor can go to the end of text unnecessarily
+			this._$input.val(sOutputValue);
+			this._curpos = this._$input.cursorPos();
+		}
 	};
 
 	/**
@@ -766,23 +783,6 @@ sap.ui.define([
 
 	};
 
-	// Overwrite DatePicker's _getInputValue  to support two date range processing
-	DateRangeSelection.prototype._getInputValue = function(sValue) {
-
-		sValue = (typeof sValue == "undefined") ? this._$input.val() : sValue.toString();
-
-		if (!sValue) {
-			return "";
-		}
-
-		var aDates = this._parseValue(sValue);
-		sValue = this._formatValue( aDates[0], aDates[1]);
-
-		return sValue;
-
-	};
-
-	// overwrite _getInputValue to do the output conversion
 	DateRangeSelection.prototype.updateDomValue = function(sValue) {
 
 		// dom value updated other than value property
@@ -794,11 +794,18 @@ sap.ui.define([
 		var aDates = this._parseValue(sValue);
 		sValue = this._formatValue( aDates[0], aDates[1]);
 
-		// update the DOM value when necessary
-		// otherwise cursor can goto end of text unnecessarily
-		if (this.isActive() && (this._$input.val() !== sValue)) {
-			this._$input.val(sValue);
-			this._$input.cursorPos(this._curpos);
+		// if set to true, handle the user input and data
+		// model updates concurrency in order to not overwrite
+		// values coming from the user
+		if (this._bPreferUserInteraction) {
+			this.handleInputValueConcurrency(sValue);
+		} else {
+			// update the DOM value when necessary
+			// otherwise cursor can goto end of text unnecessarily
+			if (this.isActive() && (this._$input.val() !== sValue)) {
+				this._$input.val(sValue);
+				this._$input.cursorPos(this._curpos);
+			}
 		}
 
 		return this;

package/src/sap/m/DateTimeField.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public
@@ -108,6 +108,28 @@ sap.ui.define([
 				 * @since 1.54
 				 */
 				initialFocusedDateValue: {type: "object", group: "Data", defaultValue: null}
+			},
+			events : {
+
+				/**
+				 * Fired when the value of the <code>DateTimeField</code> is changed by user interaction - each keystroke, delete, paste, etc.
+				 *
+				 * <b>Note:</b> Browsing autocomplete suggestions doesn't fire the event.
+				 * @since 1.104.0
+				 */
+				liveChange: {
+					parameters : {
+						/**
+						 * The current value of the input, after a live change event.
+						 */
+						value: {type : "string"},
+
+						/**
+						 * The previous value of the input, before the last user interaction.
+						 */
+						previousValue: {type : "string"}
+					}
+				}
 			}
 		}
 	});
@@ -123,8 +145,18 @@ sap.ui.define([
 			this.setLastValue(sValue);
 		}
 
-		// set the property in any case but check validity on output
-		this.setProperty("value", sValue);
+		// convert to date object and check validity on output
+		var oDate = this._parseAndValidateValue(sValue);
+		this.setProperty("dateValue", oDate, this._bPreferUserInteraction);
+
+		// do not call InputBase.setValue because the displayed value and the output value might have different pattern
+		this._formatValueAndUpdateOutput(oDate, sValue);
+		this.setProperty("value", sValue, this._bPreferUserInteraction);
+
+		return this;
+	};
+
+	DateTimeField.prototype._parseAndValidateValue = function(sValue) {
 		this._bValid = true;
 
 		// convert to date object
@@ -146,25 +178,26 @@ sap.ui.define([
 			}
 		}
 
-		this.setProperty("dateValue", oDate);
-
-		// do not call InputBase.setValue because the displayed value and the output value might have different pattern
-		if (this.getDomRef()) {
-			// convert to output
-			var sOutputValue;
-			if (oDate) {
-				sOutputValue = this._formatValue(oDate);
-			} else {
-				sOutputValue = sValue;
-			}
+		return oDate;
+	};
 
-			if (this._$input.val() !== sOutputValue) {
-				this._$input.val(sOutputValue);
-				this._curpos = this._$input.cursorPos();
-			}
+	DateTimeField.prototype._formatValueAndUpdateOutput = function(oDate, sValue) {
+		if (!this.getDomRef()) {
+			return;
+		}
+		// convert to output
+		var sOutputValue = oDate ? this._formatValue(oDate) : sValue;
+
+		if (this._bPreferUserInteraction) {
+			// Handle the value concurrency before setting the value property of the control,
+			// in order to distinguish whether the user only focused the input field or typed in it
+			this.handleInputValueConcurrency(sOutputValue);
+		} else if (this._$input.val() !== sOutputValue) {
+			// update the DOM value when necessary
+			// otherwise cursor can go to the end of text unnecessarily
+			this._$input.val(sOutputValue);
+			this._curpos = this._$input.cursorPos();
 		}
-
-		return this;
 	};
 
 	DateTimeField.prototype.setDateValue = function (oDate) {
@@ -245,6 +278,40 @@ sap.ui.define([
 				.setVisible(this.getValueState() !== ValueState.None);
 		}
 
+		this._sPreviousValue = this.getDOMValue();
+	};
+
+	/**
+	 * Event handler for user input.
+	 *
+	 * @public
+	 * @param {jQuery.Event} oEvent User input.
+	 */
+	 DateTimeField.prototype.oninput = function(oEvent) {
+		InputBase.prototype.oninput.call(this, oEvent);
+		if (oEvent.isMarked("invalid")) {
+			return;
+		}
+
+		var sValue = this.getDOMValue();
+
+		if (sValue !== this._sPreviousValue) {
+			this.fireLiveChange({
+				value: sValue,
+				previousValue : this._sPreviousValue
+			});
+			this._sPreviousValue = sValue;
+		}
+	 };
+
+	/**
+	 * Gets the inner input DOM value.
+	 *
+	 * @protected
+	 * @returns {any} The value of the input.
+	 */
+	 DateTimeField.prototype.getDOMValue = function() {
+		return this._$input.val();
 	};
 
 	DateTimeField.prototype._getValueStateHeader = function () {

package/src/sap/m/DateTimeInput.js

@@ -62,7 +62,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimePicker.js

@@ -10,7 +10,6 @@ sap.ui.define([
 	'./InputBase',
 	'./DatePicker',
 	'sap/ui/model/type/Date',
-	'sap/ui/unified/DateRange',
 	'./library',
 	'sap/ui/core/library',
 	'sap/ui/core/Control',
@@ -25,15 +24,14 @@ sap.ui.define([
 	'./SegmentedButtonItem',
 	'./ResponsivePopover',
 	'./Button',
-	"sap/ui/events/KeyCodes",
 	"sap/ui/core/IconPool",
-	"sap/ui/qunit/utils/waitForThemeApplied"
+	"sap/ui/qunit/utils/waitForThemeApplied",
+	"sap/ui/dom/jquery/cursorPos" // provides jQuery.fn.cursorPos
 ], function(
 	jQuery,
 	InputBase,
 	DatePicker,
 	Date1,
-	DateRange,
 	library,
 	coreLibrary,
 	Control,
@@ -48,7 +46,6 @@ sap.ui.define([
 	SegmentedButtonItem,
 	ResponsivePopover,
 	Button,
-	KeyCodes,
 	IconPool,
 	waitForThemeApplied
 ) {
@@ -145,7 +142,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public
@@ -188,9 +185,7 @@ sap.ui.define([
 			/**
 			 * 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.
+			 * The <code>dateValue</code> property should not be used as this could lead to an unpredictable results. Use <code>getValue()</code> instead.
 			 * @since 1.99
 			 */
 			timezone: { type: "string", group: "Data" }
@@ -313,16 +308,27 @@ sap.ui.define([
 			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)
-				});
+				this.getCalendar().attachSelect(function () {
+					this._addCalendarDelegate();
+				}.bind(this));
+				this._addCalendarDelegate();
 			} else {
 				oSwitcher.setVisible(false);
 			}
 		},
 
+		_addCalendarDelegate: function () {
+			var oSwitcher = this.getAggregation("_switcher"),
+				oOnAfterRenderingDelegate = {
+					onAfterRendering: function() {
+						this._switchVisibility(oSwitcher.getSelectedKey());
+						this.getCalendar().removeDelegate(oOnAfterRenderingDelegate);
+					}.bind(this)
+				};
+
+			this.getCalendar().addDelegate(oOnAfterRenderingDelegate);
+		},
+
 		_handleSelect: function(oEvent) {
 
 			var sKey = oEvent.getParameter("key");
@@ -377,29 +383,34 @@ sap.ui.define([
 		this._bOnlyCalendar = false;
 	};
 
-	DateTimePicker.prototype.setValue = function(sValue) {
-		var sFallbackValue;
-
-		DatePicker.prototype.setValue.apply(this, arguments);
-
+	DateTimePicker.prototype._formatValueAndUpdateOutput = function(oDate, sValue) {
 		delete this._prefferedValue;
 
-		if (!this.getDateValue()) {
-			sFallbackValue = this._fallbackParse(sValue);
+		if (!this.getDomRef()) {
+			return;
+		}
 
+		// convert to output
+		var sOutputValue = oDate ? this._formatValue(oDate) : sValue;
+		if (!oDate) {
+			var 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();
-				}
+				sOutputValue = sFallbackValue;
 			}
 		}
 
-		return this;
+		if (this._bPreferUserInteraction) {
+			// Handle the value concurrency before setting the value property of the control,
+			// in order to distinguish whether the user only focused the input field or typed in it
+			this.handleInputValueConcurrency(sOutputValue);
+		} else if (this._$input.val() !== sOutputValue) {
+			// update the DOM value when necessary
+			// otherwise cursor can go to the end of text unnecessarily
+			this._$input.val(sOutputValue);
+			this._curpos = this._$input.cursorPos();
+		}
 	};
 
 	DateTimePicker.prototype.setTimezone = function(sTimezone) {
@@ -445,6 +456,8 @@ sap.ui.define([
 	};
 
 	DateTimePicker.prototype.onAfterRendering = function() {
+		DatePicker.prototype.onAfterRendering.apply(this, arguments);
+
 		if (this._getShowTimezone()) {
 			waitForThemeApplied().then(function() {
 				var oDummyContentDomRef = this.$().find(".sapMDummyContent"),
@@ -1014,6 +1027,17 @@ sap.ui.define([
 		return oDate;
 	};
 
+	/**
+	 * This method should not be used because it could produce unpredictable results. Use <code>getValue()</code> instead.
+	 *
+	 * @name sap.m.DateTimePicker#getDateValue
+	 * @function
+	 * @public
+	 * @returns {object}
+	 * @since 1.102
+	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
+	 */
+
 	DateTimePicker.prototype.getLocaleId = function(){
 
 		return Core.getConfiguration().getFormatSettings().getFormatLocale().toString();

package/src/sap/m/Dialog.js

@@ -70,6 +70,9 @@ function(
 		// shortcut for sap.ui.core.OpenState
 		var OpenState = coreLibrary.OpenState;
 
+		// shortcut for sap.m.ButtonType
+		var ButtonType = library.ButtonType;
+
 		// shortcut for sap.m.DialogType
 		var DialogType = library.DialogType;
 
@@ -175,7 +178,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.103.0
+		* @version 1.105.0
 		*
 		* @constructor
 		* @public
@@ -638,6 +641,7 @@ function(
 		/**
 		 * Open the dialog.
 		 *
+		 * @return {this} <code>this</code> to allow method chaining
 		 * @public
 		 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 		 */
@@ -687,6 +691,7 @@ function(
 		/**
 		 * Close the dialog.
 		 *
+		 * @return {this} <code>this</code> to allow method chaining
 		 * @public
 		 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 		 */
@@ -927,9 +932,41 @@ function(
 				this._isSpaceOrEnterPressed = true;
 			}
 
+			var iKeyCode = oEvent.which || oEvent.keyCode;
+
+			if ((oEvent.ctrlKey || oEvent.metaKey) && iKeyCode === KeyCodes.ENTER) {
+
+				var oPositiveButton = this._findFirstPositiveButton();
+
+				if (oPositiveButton) {
+
+					oPositiveButton.firePress();
+					oEvent.stopPropagation();
+					oEvent.preventDefault();
+					return;
+				}
+			}
+
 			this._handleKeyboardDragResize(oEvent);
 		};
 
+		/**
+		 * Finds first positive button
+		 * We call positive the buttons with type "Accept" or "Emphasized"
+		 *
+		 * @private
+		 */
+		 Dialog.prototype._findFirstPositiveButton = function () {
+			var aButtons = this.getButtons();
+
+			for (var i = 0; i < aButtons.length; i++) {
+				var oButton = aButtons[i];
+				if (oButton.getType() === ButtonType.Accept || oButton.getType() === ButtonType.Emphasized) {
+					return oButton;
+				}
+			}
+		 };
+
 		/**
 		 * Handles the keyboard drag/resize functionality
 		 *

package/src/sap/m/DisplayListItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DraftIndicator.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DynamicDate.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.103.0
+		 * @version 1.105.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/DynamicDateFormat.js

@@ -10,14 +10,11 @@ sap.ui.define([
 	'sap/ui/core/format/NumberFormat',
 	'sap/ui/core/Locale',
 	'sap/ui/core/LocaleData',
-	"sap/base/Log",
 	"sap/base/util/deepExtend",
-	"sap/base/util/isEmptyObject",
-	"sap/ui/core/date/UniversalDateUtils",
 	"sap/ui/unified/calendar/CalendarUtils",
 	"./library"
 ],
-	function(DateFormat, NumberFormat, Locale, LocaleData, Log, deepExtend, isEmptyObject, UniversalDateUtils, CalendarUtils, library) {
+	function(DateFormat, NumberFormat, Locale, LocaleData, deepExtend, CalendarUtils, library) {
 		"use strict";
 
 		/**
@@ -332,7 +329,7 @@ sap.ui.define([
 		DynamicDateFormat.prototype._checkFormatterUTCTimezone = function(sOption) {
 			var sType = "";
 			if (aParameterTypesByStandardOptionKey[sOption]) {
-				sType = aParameterTypesByStandardOptionKey[sOption];
+				sType = aParameterTypesByStandardOptionKey[sOption][0];
 			}
 
 			// ensure that in options like last/next days or +/- days we still use correct timezone when formatting the dates.