@openui5/sap.m 1.97.1 → 1.99.1

package/src/sap/m/DateTimePickerRenderer.js

@@ -30,6 +30,46 @@ sap.ui.define(['sap/ui/core/Renderer', './DatePickerRenderer', './InputBaseRende
 		return mAccessibilityState;
 	};
 
+	DateTimePickerRenderer.writeAdditionalContent = function(oRm, oControl) {
+		var sTimezone = oControl._getTimezone(true);
+
+		if (!oControl._getShowTimezone()) {
+			return;
+		}
+
+		oRm.openStart("div", oControl.getId() + "-timezoneLabel");
+		oRm.class("sapMDTPTimezoneLabel");
+		oRm.attr("title", sTimezone);
+		oRm.openEnd();
+
+		oRm.openStart("span");
+		oRm.openEnd();
+		oRm.text(sTimezone);
+		oRm.close("span");
+
+		oRm.close("div");
+
+		oRm.openStart("span");
+		oRm.class("sapMDummyContent");
+		oRm.openEnd();
+
+		// try to choose the date that is the longest when formatted
+		oRm.text(oControl._getFormatter(true).format(
+			new Date(2000, 10, 20, 10, 10, 10),
+			sap.ui.getCore().getConfiguration().getTimezone()));
+		oRm.close("span");
+	};
+
+	DateTimePickerRenderer.addOuterClasses = function(oRm, oControl) {
+		DatePickerRenderer.addOuterClasses(oRm, oControl);
+
+		oRm.class("sapMDTP");
+
+		if (oControl._getShowTimezone()) {
+			oRm.class("sapMDTPWithTimezone");
+		}
+	};
+
 	return DateTimePickerRenderer;
 
 }, /* bExport= */ true);

package/src/sap/m/Dialog.js

@@ -175,7 +175,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.97.1
+		* @version 1.99.1
 		*
 		* @constructor
 		* @public
@@ -381,7 +381,7 @@ function(
 					rightButton: {type: "sap.m.Button", multiple: false, deprecated: true},
 
 					/**
-					 * In the Dialog focus is set first on the <code>beginButton</code> and then on <code>endButton</code>, when available. If another control needs to get the focus, set the <code>initialFocus</code> with the control which should be focused on. Setting <code>initialFocus</code> to input controls doesn't open the On-Screen keyboard on mobile device as, due to browser limitation, the On-Screen keyboard can't be opened with JavaScript code. The opening of On-Screen keyboard must be triggered by real user action.
+					 * In the Dialog focus is set first on the <code>beginButton</code> and then on <code>endButton</code>, when available. If another control needs to get the focus, set the <code>initialFocus</code> with the control which should be focused on. Setting <code>initialFocus</code> to input controls doesn't open the On-Screen keyboard on mobile device as, due to browser restriction, the On-Screen keyboard can't be opened with JavaScript code. The opening of On-Screen keyboard must be triggered by real user action.
 					 * @since 1.15.0
 					 */
 					initialFocus: {type: "sap.ui.core.Control", multiple: false},
@@ -454,11 +454,17 @@ function(
 
 		Dialog._bPaddingByDefault = (Core.getConfiguration().getCompatibilityVersion("sapMDialogWithPadding").compareTo("1.16") < 0);
 
-		Dialog._mIcons = {};
-		Dialog._mIcons[ValueState.Success] = IconPool.getIconURI("sys-enter-2");
-		Dialog._mIcons[ValueState.Warning] = IconPool.getIconURI("alert");
-		Dialog._mIcons[ValueState.Error] = IconPool.getIconURI("error");
-		Dialog._mIcons[ValueState.Information] = IconPool.getIconURI("information");
+		Dialog._initIcons = function () {
+			if (Dialog._mIcons) {
+				return;
+			}
+
+			Dialog._mIcons = {};
+			Dialog._mIcons[ValueState.Success] = IconPool.getIconURI("sys-enter-2");
+			Dialog._mIcons[ValueState.Warning] = IconPool.getIconURI("alert");
+			Dialog._mIcons[ValueState.Error] = IconPool.getIconURI("error");
+			Dialog._mIcons[ValueState.Information] = IconPool.getIconURI("information");
+		};
 
 		/* =========================================================== */
 		/*                  begin: Lifecycle functions                 */
@@ -733,6 +739,7 @@ function(
 			if (sState === ValueState.None) {
 				sDefaultIcon = "";
 			} else {
+				Dialog._initIcons();
 				sDefaultIcon = Dialog._mIcons[sState];
 			}
 

package/src/sap/m/DialogRenderer.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * Renders the HTML for the Dialog 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} oDialog An object representation of the control that should be rendered.
+	 * @param {sap.m.Dialog} oDialog An object representation of the control that should be rendered.
 	 */
 	DialogRenderer.render = function (oRM, oDialog) {
 		var sId = oDialog.getId(),

package/src/sap/m/DisplayListItem.js

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

package/src/sap/m/DisplayListItemRenderer.js

@@ -27,7 +27,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRen
 	 * @param {sap.ui.core.RenderManager}
 	 *          oRenderManager the RenderManager that can be used for writing to the
 	 *          Render-Output-Buffer
-	 * @param {sap.ui.core.Control}
+	 * @param {sap.m.DisplayListItem}
 	 *          oControl an object representation of the control that should be
 	 *          rendered
 	 */

package/src/sap/m/DraftIndicator.js

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

package/src/sap/m/DraftIndicatorRenderer.js

@@ -20,7 +20,7 @@ sap.ui.define([],
 	 * 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.DraftIndicator} oControl an object representation of the control that should be rendered
 	 */
 	DraftIndicatorRenderer.render = function(oRm, oControl) {
 

package/src/sap/m/DynamicDate.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.99.1
 		 *
 		 * @constructor
 		 * @public
@@ -88,7 +88,7 @@ sap.ui.define([
 			var aValueTypes = DynamicDateUtil.getOption(oValue.operator).getValueTypes();
 
 			oResult.values = oResult.values.map(function(oValue, index) {
-				if (aValueTypes[index] === "date") {
+				if (aValueTypes[index] === "date" || aValueTypes[index] === "datetime") {
 					return oTimestampInputFormat.parse(oValue);
 				}
 
@@ -128,7 +128,7 @@ sap.ui.define([
 			aValueTypes = DynamicDateUtil.getOption(oValue.operator).getValueTypes();
 
 			oResult.values = oResult.values.map(function(oValue, index) {
-				if (aValueTypes[index] === "date") {
+				if (aValueTypes[index] === "date" || aValueTypes[index] === "datetime") {
 					return oTimestampInputFormat.format(oValue);
 				}
 

package/src/sap/m/DynamicDateFormat.js

@@ -41,7 +41,9 @@ sap.ui.define([
 		var _dynamicParameterIndexes = {};
 		var aParameterTypesByStandardOptionKey = {
 			"DATE": ["date"],
+			"DATETIME": ["datetime"],
 			"DATERANGE": ["date", "date"],
+			"DATETIMERANGE": ["datetime", "datetime"],
 			"LASTDAYS": ["int"],
 			"LASTWEEKS": ["int"],
 			"LASTMONTHS": ["int"],
@@ -54,12 +56,16 @@ sap.ui.define([
 			"NEXTYEARS": ["int"],
 			"FROM": ["date"],
 			"TO": ["date"],
+			"FROMDATETIME": ["datetime"],
+			"TODATETIME": ["datetime"],
 			"SPECIFICMONTH": ["month"],
+			"SPECIFICMONTHINYEAR": ["month", "int"],
 			"TODAYFROMTO": ["int", "int"]
 		};
+		var aStandardDynamicDateRangeKeysArray = Object.keys(library.StandardDynamicDateRangeKeys);
 
-		for (var i = 0; i < library.StandardDynamicDateRangeKeys.length; i++) {
-			var sKey = library.StandardDynamicDateRangeKeys[i];
+		for (var i = 0; i < aStandardDynamicDateRangeKeysArray.length; i++) {
+			var sKey = aStandardDynamicDateRangeKeysArray[i];
 			var sPattern = _resourceBundle.getText("DYNAMIC_DATE_" + sKey.toUpperCase() + "_FORMAT");
 			var aStaticParts = sPattern.split('{').map(function(sPart) {
 				var iClosingBracket = sPart.indexOf('}');
@@ -108,7 +114,9 @@ sap.ui.define([
 
 		DynamicDateFormat.oDefaultDynamicDateFormat = {
 			"date": {},
+			"datetime": {},
 			"month": { pattern: "MMMM" },
+			"year": { pattern: "yyyy" },
 			"int": {}
 		};
 
@@ -143,7 +151,9 @@ sap.ui.define([
 				};
 			});
 
+			oFormat._dateTimeFormatter = DateFormat.getDateTimeInstance(oFormat.oOriginalFormatOptions["datetime"]);
 			oFormat._monthFormatter = DateFormat.getInstance(oFormat.oOriginalFormatOptions["month"]);
+			oFormat._yearFormatter = DateFormat.getInstance(oFormat.oOriginalFormatOptions["year"]);
 			oFormat._numberFormatter = NumberFormat.getInstance(oFormat.oOriginalFormatOptions["int"]);
 			oFormat._resourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
@@ -165,6 +175,14 @@ sap.ui.define([
 				var oDate = new Date();
 				oDate.setMonth(aParams[0]);
 				aParams[0] = this._monthFormatter.format(oDate);
+			} else if (sKey === "SPECIFICMONTHINYEAR") {
+				var oDate = new Date();
+
+				oDate.setMonth(aParams[0]);
+				oDate.setYear(aParams[1]);
+
+				aParams[0] = this._monthFormatter.format(oDate);
+				aParams[1] = this._yearFormatter.format(oDate);
 			} else if (sKey === "LASTDAYS" && aParams[0] === 1) {
 				sKey = "YESTERDAY";
 				aParams = [];
@@ -174,10 +192,15 @@ sap.ui.define([
 			} else if ((sKey === "LASTDAYS" || sKey === "NEXTDAYS") && aParams[0] === 0) {
 				sKey = "TODAY";
 				aParams = [];
+			} else if (sKey === "DATETIME") {
+				aParams[0] = this._dateTimeFormatter.format(oObj.values[0]);
 			}
 
 			var aFormattedParams = aParams.map(function(param) {
 				if (param instanceof Date) {
+					if (sKey === "DATETIMERANGE" || sKey === "FROMDATETIME" || sKey === "TODATETIME") {
+						return this._dateTimeFormatter.format(param);
+					}
 					return this._dateFormatter.format(param);
 				}
 
@@ -195,6 +218,7 @@ sap.ui.define([
 		 * Parses a given list string into an array.
 		 *
 		 * @param {string} sValue String value to be parsed
+		 * @param {string} sKey String value of the key we will parse for
 		 * @return {object} The parsed output value
 		 * @public
 		 */
@@ -226,6 +250,9 @@ sap.ui.define([
 						case "date":
 							oVal = this._dateFormatter.parse(sCurrentMatch);
 							break;
+						case "datetime":
+							oVal = this._dateTimeFormatter.parse(sCurrentMatch);
+							break;
 						case "month":
 							var aMonthNames = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].map(function(i) {
 								var oDate = new Date();

package/src/sap/m/DynamicDateOption.js

@@ -9,16 +9,20 @@ sap.ui.define([
 	'sap/ui/core/Element',
 	'./Label',
 	'./StepInput',
+	'./DateTimePicker',
 	'sap/ui/unified/Calendar',
 	'sap/ui/unified/DateRange',
-	'sap/ui/unified/calendar/MonthPicker'],
+	'sap/ui/unified/calendar/MonthPicker',
+	'sap/ui/unified/calendar/CustomMonthPicker'],
 	function(
 		Element,
 		Label,
 		StepInput,
+		DateTimePicker,
 		Calendar,
 		DateRange,
-		MonthPicker) {
+		MonthPicker,
+		CustomMonthPicker) {
 		"use strict";
 
 		/**
@@ -32,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.99.1
 		 *
 		 * @public
 		 * @since 1.92
@@ -96,10 +100,11 @@ sap.ui.define([
 		 * @public
 		 */
 		DynamicDateOption.prototype.createValueHelpUI = function(oControl, fnControlsUpdated) {
-			var oValue = oControl.getValue();
-			var aParams = this.getValueHelpUITypes(oControl);
-			var aControls = [];
-			var oInputControl;
+			var oValue = oControl.getValue(),
+				aParams = this.getValueHelpUITypes(oControl),
+				valueHelpUiTypesCount = aParams.length,
+				aControls = [],
+				oInputControl;
 
 			if (!oControl.aControlsByParameters) {
 				oControl.aControlsByParameters = {};
@@ -116,7 +121,7 @@ sap.ui.define([
 					);
 				}
 
-				oInputControl = this._createControl(i, aParams[i].getType(), oValue, fnControlsUpdated);
+				oInputControl = this._createControl(i, aParams[i].getType(), oValue, fnControlsUpdated, valueHelpUiTypesCount);
 
 				aControls.push(oInputControl);
 				oControl.aControlsByParameters[this.getKey()].push(oInputControl);
@@ -148,12 +153,18 @@ sap.ui.define([
 						}
 						break;
 					case "month":
+					case "custommonth":
 					case "date":
 					case "daterange":
 						if (!oInputControl.getSelectedDates() || oInputControl.getSelectedDates().length == 0) {
 							return false;
 						}
 						break;
+					case "datetime":
+						if (!oInputControl.getDateValue()) {
+							return false;
+						}
+						break;
 				}
 			}
 
@@ -191,6 +202,20 @@ sap.ui.define([
 						}
 
 						vOutput = oInputControl.getSelectedDates()[0].getStartDate();
+					break;
+					case "custommonth":
+						if (!oInputControl.getSelectedDates() || !oInputControl.getSelectedDates().length) {
+							return null;
+						}
+
+						vOutput = [oInputControl.getSelectedDates()[0].getStartDate().getMonth(), oInputControl.getSelectedDates()[0].getStartDate().getFullYear()];
+						break;
+					case "datetime":
+						if (!oInputControl.getDateValue()) {
+							return null;
+						}
+
+						vOutput = oInputControl.getDateValue();
 						break;
 					case "daterange":
 						if (!oInputControl.getSelectedDates().length) {
@@ -200,6 +225,8 @@ sap.ui.define([
 						var oEndDate = oInputControl.getSelectedDates()[0].getEndDate() || oInputControl.getSelectedDates()[0].getStartDate();
 						vOutput = [oInputControl.getSelectedDates()[0].getStartDate(), oEndDate];
 						break;
+					default:
+						break;
 				}
 
 				if (Array.isArray(vOutput)) {
@@ -281,7 +308,7 @@ sap.ui.define([
 
 		// PRIVATE
 
-		DynamicDateOption.prototype._createControl = function(iIndex, sUIType, oValue, fnControlsUpdated) {
+		DynamicDateOption.prototype._createControl = function(iIndex, sUIType, oValue, fnControlsUpdated, valueHelpUiTypesCount) {
 			var oInputControl;
 
 			switch (sUIType) {
@@ -291,12 +318,25 @@ sap.ui.define([
 				case "date":
 					oInputControl = this._createDateControl(oValue, iIndex, fnControlsUpdated);
 					break;
+				case "datetime":
+					if (valueHelpUiTypesCount === 1) {
+						// Returns DateTimePicker PopupContent control (single "datetime" option)
+						oInputControl = this._createDateTimeInnerControl(oValue, iIndex, fnControlsUpdated);
+					} else if (valueHelpUiTypesCount === 2) {
+						oInputControl = this._createDateTimeControl(oValue, iIndex, fnControlsUpdated);
+					}
+					break;
 				case "daterange":
 					oInputControl = this._createDateRangeControl(oValue, iIndex, fnControlsUpdated);
 					break;
 				case "month":
 					oInputControl = this._createMonthControl(oValue, iIndex, fnControlsUpdated);
 					break;
+				case "custommonth":
+					oInputControl = this._createCustomMonthControl(oValue, iIndex, fnControlsUpdated);
+					break;
+				default:
+					break;
 			}
 
 			return oInputControl;
@@ -320,6 +360,22 @@ sap.ui.define([
 			return oControl;
 		};
 
+		DynamicDateOption.prototype._createDateTimeControl = function(oValue, iIndex, fnControlsUpdated) {
+			var oControl = new DateTimePicker();
+
+			if (oValue && this.getKey() === oValue.operator) {
+				oControl.setDateValue(oValue.values[iIndex]);
+			}
+
+			if (fnControlsUpdated instanceof Function) {
+				oControl.attachChange(function() {
+					fnControlsUpdated(this);
+				}, this);
+			}
+
+			return oControl;
+		};
+
 		DynamicDateOption.prototype._createDateControl = function(oValue, iIndex, fnControlsUpdated) {
 			var oControl = new Calendar({
 				width: "100%"
@@ -340,6 +396,53 @@ sap.ui.define([
 			return oControl;
 		};
 
+		/**
+		 * Returns DateTimePicker PopupContent control (single "datetime" option)
+		 */
+		DynamicDateOption.prototype._createDateTimeInnerControl = function(oValue, iIndex, fnControlsUpdated) {
+			var oControl = new DateTimePicker({
+					width: "100%"
+				}),
+				oPopupContent;
+
+			// DateTimePicker is created, but only its internal PopupContent control is used
+			oControl._createPopup();
+			oControl._createPopupContent();
+			oPopupContent = oControl._oPopupContent;
+			oPopupContent.setForcePhoneView(true);
+			oPopupContent.getCalendar().removeAllSelectedDates();
+
+			if (oValue && this.getKey() === oValue.operator) {
+				var oValueCopy = new Date(oValue.values[iIndex]); // a copy is used to prevent time setting on pressing Cancel button
+				oPopupContent.getCalendar().addSelectedDate(new DateRange({
+					startDate: oValueCopy
+				}));
+				oPopupContent.getClocks()._setTimeValues(oValueCopy);
+			}
+
+			if (fnControlsUpdated instanceof Function) {
+				// capture live clock changes and update the value
+				oPopupContent.getClocks().getAggregation("_clocks").forEach(function(oClock) {
+					oClock.attachChange(function(oEvent) {
+						fnControlsUpdated(this);
+					}.bind(this));
+				}.bind(this));
+
+				// capture live AM/PM changes and update the value
+				if (oPopupContent.getClocks().getAggregation("_buttonAmPm")) {
+					oPopupContent.getClocks().getAggregation("_buttonAmPm").attachSelectionChange(function(oEvent) {
+						fnControlsUpdated(this);
+					}.bind(this));
+				}
+
+				oPopupContent.getCalendar().attachSelect(function() {
+					fnControlsUpdated(this);
+				}, this);
+			}
+
+			return oPopupContent;
+		};
+
 		DynamicDateOption.prototype._createDateRangeControl = function(oValue, iIndex, fnControlsUpdated) {
 			var oControl = new Calendar({
 				intervalSelection: true,
@@ -382,5 +485,27 @@ sap.ui.define([
 			return oControl;
 		};
 
+		DynamicDateOption.prototype._createCustomMonthControl = function(oValue, iIndex, fnControlsUpdated) {
+			var oControl = new CustomMonthPicker(),
+				oDate = new Date(),
+				iMonth = (oValue && iIndex >= 0 && this.getKey() === oValue.operator) ? oValue.values[iIndex] : oDate.getMonth(),
+				iYear = (oValue  && iIndex >= 0 && this.getKey() === oValue.operator) ? oValue.values[iIndex + 1] : oDate.getFullYear();
+
+			oDate.setDate(1);
+			oDate.setMonth(iMonth);
+			oDate.setYear(iYear);
+			oControl.addSelectedDate(new DateRange({
+				startDate: oDate
+			}));
+
+			if (fnControlsUpdated instanceof Function) {
+				oControl.attachSelect(function() {
+					fnControlsUpdated(this);
+				}, this);
+			}
+
+			return oControl;
+		};
+
 		return DynamicDateOption;
 	});