@openui5/sap.m 1.92.0 → 1.95.0

package/src/sap/m/Dialog.js

@@ -79,6 +79,9 @@ function(
 		// shortcut for sap.ui.core.ValueState
 		var ValueState = coreLibrary.ValueState;
 
+		// shortcut for sap.ui.core.TitleLevel
+		var TitleLevel = coreLibrary.TitleLevel;
+
 		// shortcut for sap.m.TitleAlignment
 		var TitleAlignment = library.TitleAlignment;
 
@@ -172,7 +175,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.92.0
+		* @version 1.95.0
 		*
 		* @constructor
 		* @public
@@ -322,13 +325,13 @@ function(
 					customHeader: {type: "sap.m.IBar", multiple: false},
 
 					/**
-					 * The button which is rendered to the left side (right side in RTL mode) of the <code>endButton</code> in the footer area inside the Dialog. As of version 1.21.1, there's a new aggregation <code>buttons</code> created with which more than 2 buttons can be added to the footer area of the Dialog. If the new <code>buttons</code> aggregation is set, any change made to this aggregation has no effect anymore. When running on a phone, this <code>button</code> (and the <code>endButton</code> together when set) is (are) rendered at the center of the footer area. When running on other platforms, this <code>button</code> (and the <code>endButton</code> together when set) is (are) rendered at the right side (left side in RTL mode) of the footer area.
+					 * The button which is rendered to the left side (right side in RTL mode) of the <code>endButton</code> in the footer area inside the Dialog. As of version 1.21.1, there's a new aggregation <code>buttons</code> created with which more than 2 buttons can be added to the footer area of the Dialog. If the new <code>buttons</code> aggregation is set, any change made to this aggregation has no effect anymore. With the Belize themes when running on a phone, this <code>button</code> (and the <code>endButton</code> together when set) is (are) rendered at the center of the footer area. While with the Quartz themes when running on a phone, this <code>button</code> (and the <code>endButton</code> together when set) is (are) rendered on the right side of the footer area. When running on other platforms, this <code>button</code> (and the <code>endButton</code> together when set) is (are) rendered at the right side (left side in RTL mode) of the footer area.
 					 * @since 1.15.1
 					 */
 					beginButton: {type: "sap.m.Button", multiple: false},
 
 					/**
-					 * The button which is rendered to the right side (left side in RTL mode) of the <code>beginButton</code> in the footer area inside the Dialog. As of version 1.21.1, there's a new aggregation <code>buttons</code> created with which more than 2 buttons can be added to the footer area of Dialog. If the new <code>buttons</code> aggregation is set, any change made to this aggregation has no effect anymore. When running on a phone, this <code>button</code> (and the <code>beginButton</code> together when set) is (are) rendered at the center of the footer area. When running on other platforms, this <code>button</code> (and the <code>beginButton</code> together when set) is (are) rendered at the right side (left side in RTL mode) of the footer area.
+					 * The button which is rendered to the right side (left side in RTL mode) of the <code>beginButton</code> in the footer area inside the Dialog. As of version 1.21.1, there's a new aggregation <code>buttons</code> created with which more than 2 buttons can be added to the footer area of Dialog. If the new <code>buttons</code> aggregation is set, any change made to this aggregation has no effect anymore. With the Belize themes when running on a phone, this <code>button</code> (and the <code>beginButton</code> together when set) is (are) rendered at the center of the footer area. While with the Quartz themes when running on a phone, this <code>button</code> (and the <code>beginButton</code> together when set) is (are) rendered on the right side of the footer area. When running on other platforms, this <code>button</code> (and the <code>beginButton</code> together when set) is (are) rendered at the right side (left side in RTL mode) of the footer area.
 					 * @since 1.15.1
 					 */
 					endButton: {type: "sap.m.Button", multiple: false},
@@ -513,7 +516,7 @@ function(
 		};
 
 		Dialog.prototype.onBeforeRendering = function () {
-			var oHeader = this.getCustomHeader() || this._header;
+			var oHeader = this._getAnyHeader();
 
 			if (!Dialog._bPaddingByDefault && this.hasStyleClass("sapUiPopupWithPadding")) {
 				Log.warning("Usage of CSS class 'sapUiPopupWithPadding' is deprecated. Use 'sapUiContentPadding' instead", null, "sap.m.Dialog");
@@ -551,6 +554,11 @@ function(
 			if (oHeader && oHeader.setTitleAlignment) {
 				oHeader.setProperty("titleAlignment", this.getTitleAlignment(), true);
 			}
+
+			if (oHeader && this._getTitles(oHeader).length === 0) {
+				oHeader._setRootAccessibilityRole("heading");
+				oHeader._setRootAriaLevel("2");
+			}
 		};
 
 		Dialog.prototype.onAfterRendering = function () {
@@ -924,7 +932,11 @@ function(
 			}
 
 			var $this = this._$dialog,
-				mOffset = $this.offset(),
+				oBoundingClientRect = this.getDomRef().getBoundingClientRect(),
+				mOffset = {
+					left: oBoundingClientRect.x,
+					top: oBoundingClientRect.y
+				},
 				oAreaDimensions = this._getAreaDimensions(),
 				iDialogWidth = $this.width(),
 				iDialogHeight = $this.height(),
@@ -933,7 +945,6 @@ function(
 				mStyles,
 				iMaxHeight;
 
-
 			this._bDisableRepositioning = true;
 			$this.addClass('sapDialogDisableTransition');
 
@@ -1286,8 +1297,6 @@ function(
 				this._header = new Bar(this.getId() + "-header", {
 					titleAlignment: this.getTitleAlignment()
 				});
-				this._header._setRootAccessibilityRole("heading");
-				this._header._setRootAriaLevel("2");
 
 				this.setAggregation("_header", this._header);
 			}
@@ -1304,7 +1313,7 @@ function(
 			} else {
 				this._headerTitle = new Title(this.getId() + "-title", {
 					text: sTitle,
-					level: "H2"
+					level: TitleLevel.H2
 				}).addStyleClass("sapMDialogTitle");
 
 				this._header.addContentMiddle(this._headerTitle);
@@ -1475,26 +1484,6 @@ function(
 			return this._oScroller;
 		};
 
-		/**
-		 *
-		 * @param {string} sPos
-		 * @returns {string}
-		 * @private
-		 */
-		Dialog.prototype._composeAggreNameInHeader = function (sPos) {
-			var sHeaderAggregationName;
-
-			if (sPos === "Begin") {
-				sHeaderAggregationName = "contentLeft";
-			} else if (sPos === "End") {
-				sHeaderAggregationName = "contentRight";
-			} else {
-				sHeaderAggregationName = "content" + sPos;
-			}
-
-			return sHeaderAggregationName;
-		};
-
 		/**
 		 *
 		 * @returns {boolean}
@@ -1509,60 +1498,6 @@ function(
 			return filteredContent.length === 0;
 		};
 
-		/**
-		 *
-		 * @param {Object} oButton
-		 * @param {string} sPos
-		 * @param {boolean} bSkipFlag
-		 * @returns {Dialog}
-		 * @private
-		 */
-		Dialog.prototype._setButton = function (oButton, sPos, bSkipFlag) {
-			return this;
-		};
-
-		/**
-		 *
-		 * @param {string} sPos
-		 * @private
-		 */
-		Dialog.prototype._getButton = function (sPos) {
-			var sAggregationName = sPos.toLowerCase() + "Button",
-				sButtonName = "_o" + this._firstLetterUpperCase(sPos) + "Button";
-
-			if (Device.system.phone) {
-				return this.getAggregation(sAggregationName, null, /*avoid infinite loop*/true);
-			} else {
-				return this[sButtonName];
-			}
-		};
-
-		/**
-		 *
-		 * @param {string} sPos
-		 * @private
-		 */
-		Dialog.prototype._getButtonFromHeader = function (sPos) {
-			if (this._header) {
-				var sHeaderAggregationName = this._composeAggreNameInHeader(this._firstLetterUpperCase(sPos)),
-					aContent = this._header.getAggregation(sHeaderAggregationName);
-				return aContent && aContent[0];
-			} else {
-				return null;
-			}
-		};
-
-		/**
-		 *
-		 * @param {string} sValue
-		 * @returns {string}
-		 * @private
-		 */
-		Dialog.prototype._firstLetterUpperCase = function (sValue) {
-			return sValue.charAt(0).toUpperCase() + sValue.slice(1);
-		};
-
-
 		/**
 		 * Returns the custom header instance when the <code>customHeader</code> aggregation is set. Otherwise, it returns the internal managed
 		 * header instance. This method can be called within composite controls which use <code>sap.m.Dialog</code> inside.
@@ -1573,8 +1508,7 @@ function(
 			var oCustomHeader = this.getCustomHeader();
 
 			if (oCustomHeader) {
-				oCustomHeader._setRootAriaLevel("2");
-				return oCustomHeader._setRootAccessibilityRole("heading");
+				return oCustomHeader;
 			} else {
 				var bShowHeader = this.getShowHeader();
 				// if showHeader is set to false and not for standard dialog in iOS in theme sap_mvi, no header.
@@ -1854,9 +1788,7 @@ function(
 
 			var oSubHeader = this.getSubHeader();
 			if (oSubHeader) {
-				var aSubtitles = oSubHeader.findAggregatedObjects(true, function(oObject) {
-					return oObject.isA("sap.m.Title");
-				});
+				var aSubtitles = this._getTitles(oSubHeader);
 
 				// if there are titles in the subheader, add all of them to labels, else use the full subheader
 				if (aSubtitles.length) {
@@ -1867,9 +1799,7 @@ function(
 			}
 
 			if (oHeader) {
-				var aTitles = oHeader.findAggregatedObjects(true, function(oObject) {
-					return oObject.isA("sap.m.Title");
-				});
+				var aTitles = this._getTitles(oHeader);
 
 				// if there are titles in the header, add all of them to labels, else use the full header
 				if (aTitles.length) {
@@ -2001,6 +1931,8 @@ function(
 				};
 
 				var oAreaDimensions = this._getAreaDimensions();
+				var oBoundingClientRect = this.getDomRef().getBoundingClientRect();
+
 				var initial = {
 					x: e.pageX,
 					y: e.pageY,
@@ -2013,8 +1945,8 @@ function(
 						y: e.offsetY ? e.offsetY : e.originalEvent.layerY
 					},
 					position: {
-						x: that._$dialog.offset().left,
-						y: that._$dialog.offset().top
+						x: oBoundingClientRect.x,
+						y: oBoundingClientRect.y
 					}
 				};
 				var mouseMoveHandler;
@@ -2146,5 +2078,11 @@ function(
 			Control.prototype._applyContextualSettings.call(this);
 		};
 
+		Dialog.prototype._getTitles = function (oContainer) {
+			return oContainer.findAggregatedObjects(true, function(oObject) {
+				return oObject.isA("sap.m.Title");
+			});
+		};
+
 		return Dialog;
 	});

package/src/sap/m/DialogRenderer.js

@@ -178,7 +178,7 @@ sap.ui.define([
 				.close("header");
 		}
 
-		if (oSubHeader) {
+		if (oSubHeader && oSubHeader.getVisible()) {
 			oSubHeader._applyContextClassFor("subheader");
 			oRM.openStart("header")
 				.class("sapMDialogSubHeader")

package/src/sap/m/DisplayListItem.js

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

package/src/sap/m/DraftIndicator.js

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

package/src/sap/m/DynamicDate.js

@@ -8,13 +8,17 @@ sap.ui.define([
 	'sap/m/DynamicDateUtil',
 	'sap/ui/model/SimpleType',
 	'sap/ui/model/FormatException',
-	'sap/ui/model/ParseException'
+	'sap/ui/model/ParseException',
+	'sap/ui/model/ValidateException',
+	'sap/base/util/each'
 ],
 	function(
 		DynamicDateUtil,
 		SimpleType,
 		FormatException,
-		ParseException
+		ParseException,
+		ValidateException,
+		each
 	) {
 		"use strict";
 
@@ -22,19 +26,30 @@ sap.ui.define([
 		 * Constructor for a dynamic date range type.
 		 *
 		 * @class
-		 * This class represents the dynamic date range type.
+		 * This class represents the dynamic date range type. Model values should be in
+		 * the following format: { operator: "KEY", values: [param1, param2] }. Where the
+		 * supported parameters are timestamps, month indexes and numbers (all three are numbers).
+		 * Their type is defined by the corresponding DynamicDateOption instance identified by
+		 * the same "KEY". This class is capable of formatting only the value parameters expected
+		 * by the DynamicDateRange control. A display format may be provided via the format options.
 		 *
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.95.0
 		 *
 		 * @constructor
 		 * @public
-		 * @param {object} [oFormatOptions] Formatting options.
-		 * @param {object} [oFormatOptions.date] Format options controlling the options that contain dates in their display values.
-		 * @param {object} [oFormatOptions.month] Format options controlling the options that contain months in their display values.
-		 * @param {object} [oFormatOptions.int] Format options controlling the options that contain numbers in their display values.
+		 * @param {object} [oFormatOptions] Format options. There are format options for each of the supported types of value parameters.
+		 * @param {object} [oFormatOptions.date] Display format options for the values that contain dates. For a list of all available options,
+		 * see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.
+		 * @param {object} [oFormatOptions.month] Display format options for the values that contain month names. The only
+		 * supported option is the <code>pattern</code> using the respective symbols for displaying months "MM", "MMM" or "MMMM".
+		 * @param {object} [oFormatOptions.int] Display format options for the values that contain numbers. For a list of all available options,
+		 * see {@link sap.ui.core.format.NumberFormat.getInstance NumberFormat}.
+		 * @param {object} [oConstraints] Value constraints
+		 * @param {int} [oConstraints.minimum] Smallest resulting date allowed for this type. Must be provided as a timestamps.
+		 * @param {int} [oConstraints.maximum] Greatest resulting date allowed for this type. Must be provided as a timestamps.
 		 * @since 1.92
 		 * @alias sap.m.DynamicDate
 		 * @experimental Since 1.92. This class is experimental and provides only limited functionality. Also the API might be changed in future.
@@ -88,6 +103,7 @@ sap.ui.define([
 		 * The whole value is in the following format { operator: "KEY", values: [...array with JS dates or numbers to be parsed]}.
 		 * Only parses the 'values' part of the given object. The dates are expected as Javascript Dates
 		 * and are converted to timestamps. The numbers and strings are left untouched.
+		 * Special values with operator: "PARSEERROR" generate a parse exception.
 		 *
 		 * @param {object} oValue The value to be parsed
 		 * @return {object} A value object in a similar form
@@ -122,11 +138,49 @@ sap.ui.define([
 			return oResult;
 		};
 
-		/**
-		 * Validates whether a given raw value meets the defined constraints.
-		 * <strong>Note: No support for constraints for now.</strong>
-		 */
-		DynamicDate.prototype.validateValue = function() {};
+		DynamicDate.prototype.validateValue = function(oValue) {
+			if (this.oConstraints) {
+				var oBundle = sap.ui.getCore().getLibraryResourceBundle(),
+					oMBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m"),
+					aViolatedConstraints = [],
+					aMessages = [],
+					oOption = DynamicDateUtil.getOption(oValue.operator),
+					aDates = oOption.toDates(this.formatValue(oValue)).map(function(oUDate) {
+							return oUDate.getTime();
+					});
+
+				if (aDates[0] === aDates[1]) {
+					aDates.length = 1;
+				}
+
+				aDates.forEach(function(iTimestamp, index) {
+					var sErrorGenericTextKey = "DynamicDate.Invalid" + (index === 0 ? "Start" : "End");
+
+					each(this.oConstraints, function (sConstraintName, iConstraintValue) {
+						switch (sConstraintName) {
+							case "minimum":
+								if (iTimestamp < iConstraintValue) {
+									aViolatedConstraints.push("minimum");
+									aMessages.push(oMBundle.getText(sErrorGenericTextKey, [new Date(iTimestamp).toDateString()]));
+									aMessages.push(oBundle.getText("Date.Minimum", [new Date(iConstraintValue).toDateString()]));
+								}
+								break;
+							case "maximum":
+								if (iTimestamp > iConstraintValue) {
+									aViolatedConstraints.push("maximum");
+									aMessages.push(oMBundle.getText(sErrorGenericTextKey, [new Date(iTimestamp).toDateString()]));
+									aMessages.push(oBundle.getText("Date.Maximum", [new Date(iConstraintValue).toDateString()]));
+								}
+								break;
+						}
+					});
+				}, this);
+
+				if (aViolatedConstraints.length > 0) {
+					throw new ValidateException(this.combineMessages(aMessages), aViolatedConstraints);
+				}
+			}
+		};
 
 		var oTimestampInputFormat = {
 			format: function(oValue) {

package/src/sap/m/DynamicDateFormat.js

@@ -165,12 +165,23 @@ sap.ui.define([
 				var oDate = new Date();
 				oDate.setMonth(aParams[0]);
 				aParams[0] = this._monthFormatter.format(oDate);
+			} else if (sKey === "LASTDAYS" && aParams[0] === 1) {
+				sKey = "YESTERDAY";
+				aParams = [];
+			} else if (sKey === "NEXTDAYS" && aParams[0] === 1) {
+				sKey = "TOMORROW";
+				aParams = [];
+			} else if ((sKey === "LASTDAYS" || sKey === "NEXTDAYS") && aParams[0] === 0) {
+				sKey = "TODAY";
+				aParams = [];
 			}
 
 			var aFormattedParams = aParams.map(function(param) {
 				if (param instanceof Date) {
 					return this._dateFormatter.format(param);
-				} if (typeof (param) === "number") {
+				}
+
+				if (typeof (param) === "number") {
 					return this._numberFormatter.format(param);
 				} else {
 					return param.toString();

package/src/sap/m/DynamicDateOption.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.95.0
 		 *
 		 * @public
 		 * @since 1.92
@@ -125,6 +125,41 @@ sap.ui.define([
 			return aControls;
 		};
 
+		/**
+		 * Validates all input controls in the value help UI related to the current option.
+		 * If one of the input controls contains invalid value, then validation will return <code>false</code>.
+		 * If all input controls contain valid value, then the validation will return <code>true</code>.
+		 *
+		 * @public
+		 * @param {sap.m.DynamicDateRange} oControl The control instance
+		 * @returns {boolean} value help UI validity indicator
+		 */
+		DynamicDateOption.prototype.validateValueHelpUI = function(oControl) {
+			var aParams = this.getValueHelpUITypes();
+
+			for (var i = 0; i < aParams.length; i++) {
+				var oInputControl = oControl.aControlsByParameters[this.getKey()][i];
+
+				switch (aParams[i].getType()) {
+					case "int":
+						if (oInputControl._isLessThanMin(oInputControl.getValue()) ||
+							oInputControl._isMoreThanMax(oInputControl.getValue())) {
+							return false;
+						}
+						break;
+					case "month":
+					case "date":
+					case "daterange":
+						if (!oInputControl.getSelectedDates() || oInputControl.getSelectedDates().length == 0) {
+							return false;
+						}
+						break;
+				}
+			}
+
+			return true;
+		};
+
 		/**
 		 * Gets the value help controls' output values and
 		 * converts them to a DynamicDateRange value.
@@ -134,7 +169,7 @@ sap.ui.define([
 		 * @public
 		 */
 		DynamicDateOption.prototype.getValueHelpOutput = function(oControl) {
-			var aParams = this.getValueHelpUITypes(oControl),
+			var aParams = this.getValueHelpUITypes(),
 				aResult = {},
 				vOutput;
 
@@ -276,7 +311,9 @@ sap.ui.define([
 			}
 
 			if (fnControlsUpdated instanceof Function) {
-				oControl.attachChange(fnControlsUpdated);
+				oControl.attachChange(function() {
+					fnControlsUpdated(this);
+				}, this);
 			}
 
 			return oControl;
@@ -294,7 +331,9 @@ sap.ui.define([
 			}
 
 			if (fnControlsUpdated instanceof Function) {
-				oControl.attachSelect(fnControlsUpdated);
+				oControl.attachSelect(function() {
+					fnControlsUpdated(this);
+				}, this);
 			}
 
 			return oControl;
@@ -315,7 +354,9 @@ sap.ui.define([
 			}
 
 			if (fnControlsUpdated instanceof Function) {
-				oControl.attachSelect(fnControlsUpdated);
+				oControl.attachSelect(function() {
+					fnControlsUpdated(this);
+				}, this);
 			}
 
 			return oControl;
@@ -323,23 +364,22 @@ sap.ui.define([
 
 		DynamicDateOption.prototype._createMonthControl = function(oValue, iIndex, fnControlsUpdated) {
 			var oControl = new MonthPicker(),
-				oDate;
-
-			if (oValue && this.getKey() === oValue.operator) {
-				oDate = new Date();
-				oDate.setMonth(oValue.values[iIndex]);
+				oDate = new Date(),
+				iMonth = (oValue && this.getKey() === oValue.operator) ? oValue.values[iIndex] : oDate.getMonth();
 
-				oControl.addSelectedDate(new DateRange({
-					startDate: oDate
-				}));
-			}
+			oControl.setMonth(iMonth);
+			oControl.addSelectedDate(new DateRange({
+				startDate: oDate
+			}));
 
 			if (fnControlsUpdated instanceof Function) {
-				oControl.attachSelect(fnControlsUpdated);
+				oControl.attachSelect(function() {
+					fnControlsUpdated(this);
+				}, this);
 			}
 
 			return oControl;
 		};
 
 		return DynamicDateOption;
-	});
+	});