@openui5/sap.m 1.115.1 → 1.116.0

package/src/sap/m/ColumnHeaderPopover.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnListItem.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public
@@ -245,17 +245,11 @@ sap.ui.define([
 
 		var aOutput = [],
 			aCells = this.getCells(),
-			aColumns = oTable.getColumns(true);
-
-		aColumns.sort(function(oCol1, oCol2) {
-			var iCol1Index = oCol1.getIndex(), iCol2Index = oCol2.getIndex(), iIndexDiff = iCol1Index - iCol2Index;
-			if (iIndexDiff == 0) { return 0; }
-		    if (iCol1Index < 0) { return 1; }
-		    if (iCol2Index < 0) { return -1; }
-		    return iIndexDiff;
-		}).forEach(function(oColumn) {
+			aColumns = oTable.getRenderedColumns();
+
+		aColumns.forEach(function(oColumn) {
 			var oCell = aCells[oColumn.getInitialOrder()];
-			if (!oCell || !oColumn.getVisible() || (oColumn.isHidden() && !oColumn.isPopin())) {
+			if (!oCell) {
 				return;
 			}
 

package/src/sap/m/ColumnListItemRenderer.js

@@ -151,25 +151,23 @@ sap.ui.define([
 		// remove cloned headers
 		oLI._destroyClonedHeaders();
 
-		aColumns.forEach(function(oColumn, i) {
+		aColumns.forEach(function(oColumn, iColumnIndex) {
 			var oHeader,
 				bRenderCell = true,
 				oCell = aCells[oColumn.getInitialOrder()];
 
-			if (!oColumn.getVisible() || !oCell || oColumn.isPopin()) {
-				// update the visible index of the column
-				oColumn.setIndex(-1);
+			if (!oCell || !oColumn.getVisible() || oColumn.isHidden()) {
 				return;
 			}
 
-			rm.openStart("td", oLI.getId() + "_cell" + i);
+			rm.openStart("td", oLI.getId() + "_cell" + iColumnIndex);
 			rm.class("sapMListTblCell");
 			rm.attr("data-sap-ui-column", oColumn.getId());
 
 			// check column properties
 			if (oColumn) {
-				var aStyleClass = oColumn.getStyleClass(true).split(" ");
-				aStyleClass && aStyleClass.forEach(function(sClassName) {
+				var aStyleClass = oColumn.getStyleClass().split(" ").filter(Boolean);
+				aStyleClass.forEach(function(sClassName) {
 					rm.class(sClassName);
 				});
 
@@ -207,11 +205,6 @@ sap.ui.define([
 
 				oColumn.getVAlign() != "Inherit" && rm.style("vertical-align", oColumn.getVAlign().toLowerCase());
 				rm.style("text-align", oColumn.getCssAlign());
-
-				if (oColumn.isHidden()) {
-					rm.style("display", "none");
-					rm.attr("aria-hidden", "true");
-				}
 			}
 
 			rm.openEnd();
@@ -259,13 +252,10 @@ sap.ui.define([
 		// popin row
 		rm.openStart("tr", oLI.getPopin());
 		rm.class("sapMListTblSubRow");
-		rm.attr("tabindex", "-1");
 		rm.attr("data-sap-ui-related", oLI.getId());
-
 		if (oLI.isSelectable()) {
 			rm.attr("aria-selected", oLI.getSelected());
 		}
-
 		rm.openEnd();
 
 		this.renderHighlight(rm, oLI);
@@ -273,15 +263,14 @@ sap.ui.define([
 		// cell
 		rm.openStart("td", oLI.getId() + "-subcell");
 		rm.class("sapMListTblSubRowCell");
-		rm.attr("colspan", oTable.shouldRenderDummyColumn() ? oTable.getColSpan() + 1 : oTable.getColSpan());
-
-		var sPopinLayout = oTable.getPopinLayout();
+		rm.attr("colspan", oTable.getColCount() - 2 /* Highlight and Navigated cells are always rendered in popin */);
 		rm.attr("aria-labelledby", this.getAriaAnnouncement(null, "TABLE_POPIN_ROLE_DESCRIPTION"));
 		rm.openEnd();
 
+		// container
 		rm.openStart("div");
 		rm.class("sapMListTblSubCnt");
-		rm.class("sapMListTblSubCnt" + sPopinLayout);
+		rm.class("sapMListTblSubCnt" + oTable.getPopinLayout());
 		rm.openEnd();
 
 		var aCells = oLI.getCells(),
@@ -292,26 +281,23 @@ sap.ui.define([
 				return;
 			}
 
-			var oCell = aCells[oColumn.getInitialOrder()],
-				oHeader = oColumn.getHeader();
-
+			var oCell = aCells[oColumn.getInitialOrder()];
+			var oHeader = oColumn.getHeader();
 			if (!oHeader && !oCell) {
 				return;
 			}
 
-			var aStyleClass = oColumn.getStyleClass().split(" "),
+			var aStyleClass = oColumn.getStyleClass().split(" ").filter(Boolean),
 				sPopinDisplay = oColumn.getPopinDisplay(),
 				oOriginalHeader = oHeader;
 
 			/* row start */
 			rm.openStart("div");
 			rm.class("sapMListTblSubCntRow");
-
 			if (sPopinDisplay == PopinDisplay.Inline) {
 				rm.class("sapMListTblSubCntRowInline");
 			}
-
-			aStyleClass && aStyleClass.forEach(function(sClassName) {
+			aStyleClass.forEach(function(sClassName) {
 				rm.class(sClassName);
 			});
 			rm.openEnd();
@@ -347,11 +333,15 @@ sap.ui.define([
 			rm.close("div");
 		}, this);
 
+		// container
 		rm.close("div");
+
+		// cell
 		rm.close("td");
 
 		this.renderNavigated(rm, oLI);
 
+		// popin row
 		rm.close("tr");
 	};
 
@@ -370,7 +360,6 @@ sap.ui.define([
 
 	ColumnListItemRenderer.renderContentLatter = function(rm, oLI) {
 		var oTable = oLI.getTable();
-
 		if (oTable && oTable.shouldRenderDummyColumn()) {
 			if (!oTable.hasPopin()) {
 				ListItemBaseRenderer.renderContentLatter.apply(this, arguments);

package/src/sap/m/ColumnPopoverActionItem.js

@@ -16,7 +16,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/Button'], function(ColumnPopoverIte
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverCustomItem.js

@@ -17,7 +17,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/ToggleButton'], function(ColumnPopo
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverItem.js

@@ -16,7 +16,7 @@ sap.ui.define(['sap/ui/core/Element'], function(Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverSelectListItem.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @since 1.86

package/src/sap/m/ColumnPopoverSortItem.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @since 1.66

package/src/sap/m/ComboBox.js

@@ -106,7 +106,7 @@ sap.ui.define([
 		 * </ul>
 		 *
 		 * @author SAP SE
-		 * @version 1.115.1
+		 * @version 1.116.0
 		 *
 		 * @constructor
 		 * @extends sap.m.ComboBoxBase

package/src/sap/m/ComboBoxBase.js

@@ -66,7 +66,7 @@ sap.ui.define([
 		 * @abstract
 		 *
 		 * @author SAP SE
-		 * @version 1.115.1
+		 * @version 1.116.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ComboBoxTextField.js

@@ -29,7 +29,7 @@ sap.ui.define([
 		 * @extends sap.m.InputBase
 		 *
 		 * @author SAP SE
-		 * @version 1.115.1
+		 * @version 1.116.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/CustomListItem.js

@@ -24,7 +24,7 @@ sap.ui.define(['./ListItemBase', './library', './CustomListItemRenderer'],
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomTile.js

@@ -21,7 +21,7 @@ sap.ui.define(['./Tile', './library', './CustomTileRenderer'],
 	 * Use the CustomTile control to display application specific content in the Tile control.
 	 * The tile width is 8.5em and height is 10em.
 	 * @extends sap.m.Tile
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomTreeItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *        <code>Table, Form</code> etc, should not be aggregated as content.
 	 * @extends sap.m.TreeItemBase
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 * @constructor
 	 * @public
 	 * @since 1.48.0

package/src/sap/m/DatePicker.js

@@ -184,7 +184,7 @@ sap.ui.define([
 	 * the close event), or select Cancel.
 	 *
 	 * @extends sap.m.DateTimeField
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public
@@ -585,6 +585,28 @@ sap.ui.define([
 	// ALT-UP and ALT-DOWN should behave the same
 	DatePicker.prototype.onsaphide = DatePicker.prototype.onsapshow;
 
+	/**
+	 * Handle when escape is pressed. Escaping unsaved input will restore
+	 * the last valid value. If the value cannot be parsed into a date,
+	 * the input will be cleared.
+	 *
+	 * @param {jQuery.Event} oEvent The event object.
+	 * @private
+	 */
+	DatePicker.prototype.onsapescape = function(oEvent) {
+		var sLastValue = this.getLastValue(),
+			oDate = this._parseValue( this._getInputValue(), true),
+			sValueFormatInputDate = this._formatValue(oDate, true);
+
+		if (sValueFormatInputDate !== sLastValue) {
+			oEvent.setMarked();
+			oEvent.preventDefault();
+
+			this.updateDomValue(sLastValue);
+			this.onValueRevertedByEscape(sLastValue, sValueFormatInputDate);
+		}
+	};
+
 	DatePicker.prototype.onsappageup = function(oEvent){
 		var sConstructorName = this._getCalendarConstructor().getMetadata().getName();
 

package/src/sap/m/DateRangeSelection.js

@@ -163,8 +163,8 @@ sap.ui.define([
 	 * compact mode and provides a touch-friendly size in cozy mode.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.115.1
-	 * @version 1.115.1
+	 * @version 1.116.0
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public
@@ -269,7 +269,8 @@ sap.ui.define([
 			oBinding,
 			oBindingType,
 			oLocale,
-			oLocaleData;
+			oLocaleData,
+			oFormatOptions;
 
 		if (!sPlaceholder) {
 			oBinding = this.getBinding("value");
@@ -282,7 +283,8 @@ sap.ui.define([
 				if (oBindingType.oFormatOptions && oBindingType.oFormatOptions.format) {
 					sPlaceholder = oLocaleData.getCustomDateTimePattern(oBindingType.oFormatOptions.format);
 				} else {
-					sPlaceholder = oLocaleData.getDatePattern("medium");
+					oFormatOptions = Object.assign({ interval: true, singleIntervalValue: true }, oBindingType.oFormatOptions);
+					return this._getDateFormatPlaceholderText(oFormatOptions);
 				}
 			} else {
 				sPlaceholder = this.getDisplayFormat();
@@ -292,7 +294,8 @@ sap.ui.define([
 				}
 
 				if (this._checkStyle(sPlaceholder)) {
-					sPlaceholder = oLocaleData.getDatePattern(sPlaceholder);
+					oFormatOptions = Object.assign({ interval: true, singleIntervalValue: true, intervalDelimiter: _getDelimiter.call(this) }, _getFormatter.call(this).oFormatOptions);
+					return  this._getDateFormatPlaceholderText(oFormatOptions);
 				}
 			}
 
@@ -305,6 +308,10 @@ sap.ui.define([
 		return sPlaceholder;
 	};
 
+	DateRangeSelection.prototype._getDateFormatPlaceholderText = function (oFormatOptions) {
+		return  DateFormat.getDateInstance(oFormatOptions).getPlaceholderText();
+	};
+
 	// Overwrite DatePicker's setValue to support two date range processing
 	/**
 	 * Getter for property <code>value</code>.
@@ -919,6 +926,28 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+	 * Handle when escape is pressed. Escaping unsaved input will restore
+	 * the last valid value. If the value cannot be parsed into a date
+	 * range, the input will be cleared.
+	 *
+	 * @param {jQuery.Event} oEvent The event object.
+	 * @private
+	 */
+	DateRangeSelection.prototype.onsapescape = function(oEvent) {
+		var sLastValue = this.getLastValue(),
+			aDates = this._parseValue(this._getInputValue(), true),
+			sValueFormatInputDate = this._formatValue(aDates[0], aDates[1], true);
+
+		if (sValueFormatInputDate !== sLastValue) {
+			oEvent.setMarked();
+			oEvent.preventDefault();
+
+			this.updateDomValue(sLastValue);
+			this.onValueRevertedByEscape(sLastValue, sValueFormatInputDate);
+		}
+	};
+
 	//Support of two date range version of Calendar added into original DatePicker's version
 	DateRangeSelection.prototype._fillDateRange = function(){
 

package/src/sap/m/DateTimeField.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public
@@ -378,18 +378,23 @@ sap.ui.define([
 
 	DateTimeField.prototype._getPlaceholder = function() {
 
-		var sPlaceholder = this.getPlaceholder();
+		var sPlaceholder = this.getPlaceholder(),
+			oBinding = this.getBinding("value"),
+			oBindingType = oBinding && oBinding.getType && oBinding.getType(),
+			bDisplayFormat;
 
 		if (!sPlaceholder) {
-			sPlaceholder = this._getDisplayFormatPattern();
-
-			if (!sPlaceholder) {
-				sPlaceholder = this._getDefaultDisplayStyle();
+			if (oBindingType instanceof SimpleDateType) {
+				return oBindingType.getPlaceholderText();
 			}
 
-			if (this._checkStyle(sPlaceholder)) {
-				sPlaceholder = this._getLocaleBasedPattern(sPlaceholder);
+			if (oBindingType instanceof ODataType && oBindingType.oFormat) {
+				return oBindingType.oFormat.getPlaceholderText();
 			}
+
+			bDisplayFormat = !!this._getDisplayFormatPattern();
+
+			sPlaceholder = this._getFormatter(bDisplayFormat).getPlaceholderText();
 		}
 
 		return sPlaceholder;

package/src/sap/m/DateTimeInput.js

@@ -66,7 +66,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimePicker.js

@@ -176,7 +176,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Dialog.js

@@ -167,7 +167,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.115.1
+		* @version 1.116.0
 		*
 		* @constructor
 		* @public

package/src/sap/m/DisplayListItem.js

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

package/src/sap/m/DraftIndicator.js

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

package/src/sap/m/DynamicDate.js

@@ -38,7 +38,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.115.1
+		 * @version 1.116.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/DynamicDateOption.js

@@ -40,7 +40,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.115.1
+		 * @version 1.116.0
 		 *
 		 * @public
 		 * @since 1.92

package/src/sap/m/DynamicDateRange.js

@@ -242,7 +242,7 @@ sap.ui.define([
 		 * is opened. The dialog is closed via a date time period value selection or by pressing the "Cancel" button.
 		 *
 		 * @author SAP SE
-		 * @version 1.115.1
+		 * @version 1.116.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/DynamicDateValueHelpUIType.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.115.1
+		 * @version 1.116.0
 		 *
 		 * @public
 		 * @since 1.92

package/src/sap/m/ExpandableText.js

@@ -105,7 +105,7 @@ function(library,
 	 * @implements sap.ui.core.IFormContent, sap.m.IHyphenation
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilter.js

@@ -174,7 +174,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IShrinkable
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterItem.js

@@ -20,7 +20,7 @@ sap.ui.define(['./ListItemBase', './library', './FacetFilterItemRenderer'],
 	 * @class
 	 * Represents a value for the {@link sap.m.FacetFilterList} control.
 	 * @extends sap.m.ListItemBase
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterList.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * be closed.
 	 *
 	 * @extends sap.m.List
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedContent.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/FeedInput.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedListItem.js

@@ -58,7 +58,7 @@ function(
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @public
@@ -373,6 +373,7 @@ function(
 	};
 
 	FeedListItem.prototype.onAfterRendering = function() {
+		var oFormattedText = this.getAggregation("_text");
 		if (document.getElementById(this.getAggregation("_actionButton"))) {
 			document.getElementById(this.getAggregation("_actionButton").getId()).setAttribute("aria-haspopup", "menu");
 		}
@@ -380,6 +381,8 @@ function(
 			this._clearEmptyTagsInCollapsedText();
 		}
 		this.$("realtext").find('a[target="_blank"]').on("click", openLink);
+
+		oFormattedText && oFormattedText._sanitizeCSSPosition(this.getDomRef()); // perform CSS position sanitize
 	};
 
 	FeedListItem.prototype.exit = function() {
@@ -402,6 +405,9 @@ function(
 
 	// open links href using safe API
 	function openLink (oEvent) {
+		if (oEvent.originalEvent.defaultPrevented) {
+			return;
+		}
 		oEvent.preventDefault();
 		openWindow(oEvent.currentTarget.href, oEvent.currentTarget.target);
 	}
@@ -606,24 +612,35 @@ function(
 		var $threeDots = this.$("threeDots");
 		var sMoreLabel = FeedListItem._sTextShowMore;
 		var sLessLabel = FeedListItem._sTextShowLess;
+		var oFormattedText = this.getAggregation("_text");
+
 		if (this.getMoreLabel()) {
 			sMoreLabel = this.getMoreLabel();
 		}
 		if (this.getLessLabel()) {
 			sLessLabel = this.getLessLabel();
 		}
+
+		// detach click events
+		$text.find('a[target="_blank"]').off("click");
+
 		if (this._bTextExpanded) {
 			$text.html(this._sShortText.replace(/&#xa;/g, "<br>"));
+			oFormattedText._sanitizeCSSPosition($text[0]); // perform CSS position sanitize
 			$threeDots.text(" ... ");
 			this._oLinkExpandCollapse.setText(sMoreLabel);
 			this._bTextExpanded = false;
 			this._clearEmptyTagsInCollapsedText();
 		} else {
 			$text.html(this._sFullText.replace(/&#xa;/g, "<br>"));
+			oFormattedText._sanitizeCSSPosition($text[0]); // perform CSS position sanitize
 			$threeDots.text("  ");
 			this._oLinkExpandCollapse.setText(sLessLabel);
 			this._bTextExpanded = true;
 		}
+
+		// attach again click events since the text is changed without rerendering
+		$text.find('a[target="_blank"]').on("click", openLink);
 	};
 
 	/**