@openui5/sap.m 1.115.1 → 1.117.0

package/src/sap/m/Column.js

@@ -11,10 +11,9 @@ sap.ui.define([
 	'sap/ui/core/Renderer',
 	'sap/ui/core/library',
 	'sap/ui/Device',
-	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/InvisibleText"
 ],
-	function(library, Element, Renderer, coreLibrary, Device, jQuery, InvisibleText) {
+	function(library, Element, Renderer, coreLibrary, Device, InvisibleText) {
 	"use strict";
 
 
@@ -47,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @constructor
 	 * @public
@@ -212,9 +211,6 @@ sap.ui.define([
 	// default index
 	Column.prototype._index = -1;
 
-	// predefined screen size
-	Column.prototype._screen = "";
-
 	// default media value
 	Column.prototype._media = null;
 
@@ -272,7 +268,6 @@ sap.ui.define([
 
 	Column.prototype.oncontextmenu = function (oEvent) {
 		var oMenu = this._getHeaderMenuInstance();
-
 		if (oMenu) {
 			oMenu.openBy(this);
 			oEvent.preventDefault();
@@ -281,11 +276,9 @@ sap.ui.define([
 
 	Column.prototype.invalidate = function() {
 		var oParent = this.getParent();
-		if (!oParent || !oParent.bOutput) {
-			return;
+		if (oParent && oParent.bOutput) {
+			Element.prototype.invalidate.apply(this, arguments);
 		}
-
-		Element.prototype.invalidate.apply(this, arguments);
 	};
 
 	Column.prototype._clearMedia = function() {
@@ -309,8 +302,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Notify parent to re-render
-	 * Also fire media event for listeners
+	 * Notify table to re-render
 	 *
 	 * @private
 	 */
@@ -324,15 +316,9 @@ sap.ui.define([
 		this._media = oMedia;
 		this._media.matches = !!oMedia.from;
 
-		// inform parent delayed
-		setTimeout(function() {
-			// make sure that the column is visible
-			if (!this.getVisible()) {
-				return;
-			}
-			this.fireEvent("media", this);
+		if (this.getVisible()) {
 			this.informTable("Resize");
-		}.bind(this), 0);
+		}
 	};
 
 	Column.prototype._validateMinWidth = function(sWidth) {
@@ -350,35 +336,6 @@ sap.ui.define([
 		}
 	};
 
-
-	// Checks the given width(px or em), if it is a predefined screen value
-	Column.prototype._isWidthPredefined = function(sWidth) {
-		var that = this,
-			unit = sWidth.replace(/[^a-z]/ig, ""),
-			baseFontSize = parseFloat(library.BaseFontSize) || 16;
-
-		jQuery.each(library.ScreenSizes, function(screen, size) {
-			if (unit != "px") {
-				size /= baseFontSize;
-			}
-			if (size + unit == sWidth) {
-				that._minWidth = this + "px";
-				that._screen = screen;
-				return false;
-			}
-		});
-
-		if (this._minWidth) {
-			return true;
-		}
-
-		if (unit == "px") {
-			this._minWidth = sWidth;
-		} else {
-			this._minWidth = parseFloat(sWidth) * baseFontSize + "px";
-		}
-	};
-
 	/**
 	 * Returns CSS alignment according to column hAlign setting or given parameter
 	 * for Begin/End values checks the locale settings
@@ -397,21 +354,6 @@ sap.ui.define([
 		return sAlign.toLowerCase();
 	};
 
-
-	// Returns styleClass property with extra responsive class if second parameter is set true
-	Column.prototype.getStyleClass = function(bResponsive) {
-		var cls = this.getProperty("styleClass");
-		if (!bResponsive) {
-			return cls;
-		}
-		if (this._screen && (!this.getDemandPopin() || !window.matchMedia)) {
-			cls += " sapMSize-" + this._screen;
-		} else if (this._media && !this._media.matches) {
-			cls += " sapMListTblNone";
-		}
-		return cls.trim();
-	};
-
 	/**
 	 * Sets the visible column index
 	 * Negative index values can be used to clear
@@ -483,83 +425,27 @@ sap.ui.define([
 		return oTable.indexOfColumn(this);
 	};
 
-	/**
-	 * Display or hide the column from given table
-	 * This does not set the visibility property of the column
-	 *
-	 * @param {Element} oTableDomRef Table DOM reference
-	 * @param {boolean} [bDisplay] whether visible or not
-	 * @protected
-	 */
-	Column.prototype.setDisplay = function(oTableDomRef, bDisplay) {
-		if (!oTableDomRef || this._index < 0) {
-			return;
-		}
-
-		// go with native we need speed
-		var i = this._index + 1,
-			parent =  this.getParent(),
-			display = bDisplay && !this.isHidden() ? "table-cell" : "none",
-			header = oTableDomRef.querySelector("tr > th:nth-child(" + i + ")"),
-			cells = oTableDomRef.querySelectorAll("tr > td:nth-child(" + i + ")"),
-			length = cells.length;
-
-		// set display and aria
-		header.style.display = display;
-		header.setAttribute("aria-hidden", !bDisplay);
-		for (i = 0; i < length; i++) {
-			cells[i].style.display = display;
-			cells[i].setAttribute("aria-hidden", !bDisplay);
-		}
-
-		// let the parent know the visibility change
-		if (parent && parent.setTableHeaderVisibility) {
-			// make it sure rendering phase is done with timeout
-			setTimeout(function() {
-				parent.setTableHeaderVisibility(bDisplay);
-			}, 0);
-		}
-	};
-
-	Column.prototype.setVisible = function(bVisible) {
-		if (bVisible == this.getVisible()) {
-			return this;
-		}
-
-		var oParent = this.getParent(),
-			oTableDomRef = oParent && oParent.getTableDomRef && oParent.getTableDomRef(),
-			bSupressInvalidate = oTableDomRef && this._index >= 0 && !oParent.getAutoPopinMode() && !this._bForcedColumn;
-
-		if (bSupressInvalidate) {
-			this.setProperty("visible", bVisible, bSupressInvalidate);
-			this.setDisplay(oTableDomRef, bVisible);
-		} else {
-			this.setProperty("visible", bVisible);
-		}
-
-		return this;
-	};
-
 	// sets the internals for the minScreenWidth property
 	Column.prototype._setMinScreenWidth = function(sWidth) {
 		// initialize
 		this._clearMedia();
 		this._minWidth = 0;
-		this._screen = "";
 
 		if (sWidth) {
 			// check given width is known screen-size
 			sWidth = sWidth.toLowerCase();
-			var width = library.ScreenSizes[sWidth];
-			if (width) {
-				this._screen = sWidth;
-				this._minWidth = width + "px";
+			var sPredefinedWidth = library.ScreenSizes[sWidth];
+			if (sPredefinedWidth) {
+				this._minWidth = sPredefinedWidth + "px";
+			} else if (sWidth.endsWith("px")) {
+				this._minWidth = sWidth;
 			} else {
-				this._isWidthPredefined(sWidth);
+				var fBaseFontSize = parseFloat(library.BaseFontSize);
+				this._minWidth = parseFloat(sWidth) * fBaseFontSize + "px";
 			}
 
-			var parent = this.getTable();
-			if (parent && parent.isActive()) {
+			var oTable = this.getTable();
+			if (oTable && oTable.isActive()) {
 				this._addMedia();
 			} else {
 				this._bShouldAddMedia = true;
@@ -588,25 +474,6 @@ sap.ui.define([
 		return this.setProperty("minScreenWidth", sWidth);
 	};
 
-	/*
-	 * Decides if we need media query or not according to given settings
-	 * if pop-in is demanded then we always need JS media queries
-	 * if not demanded but if screen size is known CSS media query can handle
-	 */
-	Column.prototype.setDemandPopin = function(bValue) {
-		// check if setting the old value
-		if (bValue == this.getDemandPopin()) {
-			return this;
-		}
-
-		// minimum width should have been set
-		if (!this.getMinScreenWidth()) {
-			return this.setProperty("demandPopin", bValue, true);
-		}
-
-		return this.setProperty("demandPopin", bValue);
-	};
-
 	Column.prototype.setSortIndicator = function(sSortIndicator) {
 		this.setProperty("sortIndicator", sSortIndicator, true);
 		this.$().attr("aria-sort", this.getSortIndicator().toLowerCase());
@@ -614,7 +481,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Determines whether the column will be shown as pop-in or not
+	 * Determines whether the column is shown as pop-in or not
 	 *
 	 * @protected
 	 */
@@ -626,35 +493,22 @@ sap.ui.define([
 		var oTable = this.getTable();
 		if (oTable) {
 			var aHiddenInPopin = oTable.getHiddenInPopin() || [];
-			var bHideColumn = aHiddenInPopin.some(function(sImportance) {
-				return this.getImportance() === sImportance;
-			}, this);
-
+			var bHideColumn = aHiddenInPopin.includes(this.getImportance());
 			if (bHideColumn) {
 				return false;
 			}
 		}
 
-		if (this._media) {
-			return !this._media.matches;
-		}
-		return false;
+		return this.isHidden();
 	};
 
 	/**
-	 * Determines whether the column will be hidden via media queries or not
+	 * Determines whether the column is hidden without being in the popin area
 	 *
 	 * @protected
 	 */
 	Column.prototype.isHidden = function() {
-		if (this._media) {
-			return !this._media.matches;
-		}
-
-		if (this._screen && this._minWidth) {
-			return parseFloat(this._minWidth) > window.innerWidth;
-		}
-		return false;
+		return (this._media) ? !this._media.matches : false;
 	};
 
 	/**
@@ -666,9 +520,7 @@ sap.ui.define([
 	 * @protected
 	 */
 	Column.prototype.setLastValue = function(value) {
-		if (this.getMergeDuplicates()) {
-			this._lastValue = value;
-		}
+		this._lastValue = value;
 		return this;
 	};
 
@@ -703,6 +555,13 @@ sap.ui.define([
 		this.clearLastValue();
 	};
 
+	Column.prototype.onTableRendering = function() {
+		this.clearLastValue();
+		if (this._bShouldAddMedia) {
+			this._addMedia();
+		}
+	};
+
 	// when the popover opens and later closed, the focus is lost
 	// hence overwriting the getFocusDomRef to restore the focus on the active column header
 	Column.prototype.getFocusDomRef = function() {

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.117.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.117.0
 	 *
 	 * @constructor
 	 * @public
@@ -85,7 +85,8 @@ sap.ui.define([
 			if (oEvent.isMarked() || ListItemBase.detectTextSelection(this.getDomRef())) {
 				return oEvent.stopImmediatePropagation(true);
 			}
-
+		},
+		ontouchstart: function(oEvent) {
 			// focus to the main row if there is nothing to focus in the popin
 			if (oEvent.srcControl === this || !jQuery(oEvent.target).is(":sapFocusable")) {
 				this.getParent().focus();
@@ -245,17 +246,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.117.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.117.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.117.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.117.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.117.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.117.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.117.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.117.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.117.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.117.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.117.0
 	 * @constructor
 	 * @public
 	 * @since 1.48.0