@openui5/sap.m 1.97.1 → 1.100.0

package/src/sap/m/Breadcrumbs.js

@@ -42,7 +42,10 @@ sap.ui.define([
 	var SelectType = library.SelectType,
 
 		// shortcut for sap.m.BreadCrumbsSeparatorStyle
-		SeparatorStyle = library.BreadcrumbsSeparatorStyle;
+		SeparatorStyle = library.BreadcrumbsSeparatorStyle,
+
+		// shortcut for texts resource bundle
+		oResource = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
 	/**
 	 * Constructor for a new <code>Breadcrumbs</code>.
@@ -60,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -135,10 +138,15 @@ sap.ui.define([
 		DoubleGreaterThan: ">>"
 	};
 
+	Breadcrumbs._getResourceBundleText = function (sText, vOptions) {
+		return oResource.getText(sText, vOptions);
+	};
+
 	/*************************************** Framework lifecycle events ******************************************/
 
 	Breadcrumbs.prototype.init = function () {
 		this._sSeparatorSymbol = Breadcrumbs.STYLE_MAPPER[this.getSeparatorStyle()];
+		this._aCachedInvisibleTexts = [];
 		this._getInvisibleText();
 	};
 
@@ -153,6 +161,9 @@ sap.ui.define([
 		if (this._bControlsInfoCached) {
 			this._updateSelect(true);
 		}
+
+		this._destroyInvisibleTexts();
+		this._aCachedInvisibleTexts = this._buildInvisibleTexts();
 	};
 
 	Breadcrumbs.prototype.onAfterRendering = function () {
@@ -177,6 +188,7 @@ sap.ui.define([
 	Breadcrumbs.prototype.exit = function () {
 		this._resetControl();
 		this._destroyItemNavigation();
+		this._destroyInvisibleTexts();
 
 		if (this._oInvisibleText) {
 			this._oInvisibleText.destroy();
@@ -196,7 +208,7 @@ sap.ui.define([
 
 
 	Breadcrumbs.prototype._getInvisibleText = function() {
-		var oAriaLabelText = BreadcrumbsRenderer._getResourceBundleText("BREADCRUMB_LABEL");
+		var oAriaLabelText = Breadcrumbs._getResourceBundleText("BREADCRUMB_LABEL");
 
 		if (!this._oInvisibleText) {
 			this._oInvisibleText = new InvisibleText({ id: this.getId() + "-InvisibleText"});
@@ -215,7 +227,7 @@ sap.ui.define([
 				autoAdjustWidth: true,
 				icon: IconPool.getIconURI("slim-arrow-down"),
 				type: SelectType.IconOnly,
-				tooltip: BreadcrumbsRenderer._getResourceBundleText("BREADCRUMB_SELECT_TOOLTIP")
+				tooltip: Breadcrumbs._getResourceBundleText("BREADCRUMB_SELECT_TOOLTIP")
 			})), true);
 		}
 		return this.getAggregation("_select");
@@ -231,9 +243,8 @@ sap.ui.define([
 
 			oCurrentLocation.addEventDelegate({
 				onAfterRendering: function () {
-					oCurrentLocation.$().attr("aria-current", "page");
-					oCurrentLocation.$().attr("tabindex", 0);
-				}
+					this._setCurrentLocationAccInfo(oCurrentLocation);
+				}.bind(this)
 			});
 
 			this.setAggregation("_currentLocation", oCurrentLocation).addStyleClass("sapMBreadcrumbsCurrentLocation");
@@ -241,6 +252,16 @@ sap.ui.define([
 		return this.getAggregation("_currentLocation");
 	};
 
+	Breadcrumbs.prototype._setCurrentLocationAccInfo = function (oCurrentLocation) {
+		var aVisibleItems = this._getControlsForBreadcrumbTrail(),
+			positionText = Breadcrumbs._getResourceBundleText("BREADCRUMB_ITEM_POS", [aVisibleItems.length, aVisibleItems.length]);
+
+		oCurrentLocation.$().attr("aria-current", "page");
+		oCurrentLocation.$().attr("tabindex", 0);
+		oCurrentLocation.$().attr("role", "link");
+		oCurrentLocation.$().attr("aria-label", this.getCurrentLocationText() + " " + positionText);
+	};
+
 	function fnConvertArguments(sAggregationName, aArguments) {
 		var aConvertedArguments = Array.prototype.slice.apply(aArguments);
 		aConvertedArguments.unshift(sAggregationName);
@@ -284,6 +305,22 @@ sap.ui.define([
 		return vResult;
 	};
 
+	Breadcrumbs.prototype._destroyInvisibleTexts = function () {
+		var oControl;
+		this._aCachedInvisibleTexts.forEach(function (oData) {
+			oControl = sap.ui.getCore().byId(oData.controlId);
+
+			// remove reference to the invisible text on the sap.m.Link control
+			// check for control existence as it might have been destroyed already
+			if (oControl && oControl.removeAriaLabelledBy) {
+				oControl.removeAriaLabelledBy(oData.invisibleText.getId());
+			}
+
+			oData.invisibleText.destroy();
+		});
+		this._aCachedInvisibleTexts = [];
+	};
+
 	/*************************************** Select Handling ******************************************/
 
 	Breadcrumbs.prototype._decorateSelect = function (oSelect) {
@@ -447,6 +484,43 @@ sap.ui.define([
 		};
 	};
 
+	/**
+	 * Creates InvisibleText instances for the Link controls in the Breadcrumbs.
+	 * Used to add the position and the size of the controls to their ariaLabelledBy association.
+	 * An array of objects is returned for the instances to be destroyed on next invalidation with the following properties:
+	 * - controlId: the id of the Link to later remove the InvisibleText instance id from the ariaLabelledBy association
+	 * - invisibleText: the InvisibleText control itself to be destroyed
+	 */
+	Breadcrumbs.prototype._buildInvisibleTexts = function() {
+		var aVisibleItems = this._getControlsForBreadcrumbTrail(), // all visible links outside the drop-down, including current location
+			iItemCount = aVisibleItems.length,
+			oInvisibleText,
+			oInvisibleTexts = [];
+
+		aVisibleItems.forEach(function(oItem, iIndex) {
+			if (!oItem.isA("sap.m.Link")) {
+				// only links are relevant for the ariaLabelledBy association
+				return;
+			}
+
+			oInvisibleText = new InvisibleText({
+				text: Breadcrumbs._getResourceBundleText("BREADCRUMB_ITEM_POS", [iIndex + 1, iItemCount])
+			}).toStatic();
+
+			if (oItem.getAriaLabelledBy().indexOf(oItem.getId()) === -1) {
+				oItem.addAriaLabelledBy(oItem.getId());
+			}
+
+			oItem.addAriaLabelledBy(oInvisibleText.getId());
+			oInvisibleTexts.push({
+				controlId: oItem.getId(),
+				invisibleText: oInvisibleText
+			});
+		});
+
+		return oInvisibleTexts;
+	};
+
 	Breadcrumbs.prototype._getControlDistribution = function (iMaxContentSize) {
 		iMaxContentSize = iMaxContentSize || this._iContainerSize;
 		this._iContainerSize = iMaxContentSize;

package/src/sap/m/BreadcrumbsRenderer.js

@@ -16,7 +16,6 @@ sap.ui.define(["sap/m/Text"], function (Text) {
 		apiVersion: 2
 	};
 
-	var oResource = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
@@ -51,18 +50,23 @@ sap.ui.define(["sap/m/Text"], function (Text) {
 			this._renderControlInListItem(oRm, oSelect, sSeparator, false, "sapMBreadcrumbsSelectItem");
 		}
 
-		aControls.forEach(function (oChildControl) {
-			this._renderControlInListItem(oRm, oChildControl, sSeparator, oChildControl instanceof Text);
+		aControls.forEach(function (oChildControl, iIndex) {
+			this._renderControlInListItem(oRm, oChildControl, sSeparator, oChildControl instanceof Text, undefined, iIndex, aControls.length);
 		}, this);
 
 		oRm.close("ol");
 		oRm.close("nav");
 	};
 
-	BreadcrumbsRenderer._renderControlInListItem = function (oRm, oControl, sSeparator, bSkipSeparator, sAdditionalItemClass) {
+	BreadcrumbsRenderer._renderControlInListItem = function (oRm, oControl, sSeparator, bSkipSeparator, sAdditionalItemClass, iIndex, iVisibleItemsCount) {
 		oRm.openStart("li");
 		oRm.class("sapMBreadcrumbsItem");
 		oRm.class(sAdditionalItemClass);
+		if (iVisibleItemsCount && iIndex >= 0) {
+			// override the default size of the list to include the links count only
+			oRm.attr("aria-posinset", iIndex + 1);
+			oRm.attr("aria-setsize", iVisibleItemsCount);
+		}
 		oRm.openEnd();
 		oRm.renderControl(oControl);
 		if (!bSkipSeparator) {
@@ -71,9 +75,6 @@ sap.ui.define(["sap/m/Text"], function (Text) {
 		oRm.close("li");
 	};
 
-	BreadcrumbsRenderer._getResourceBundleText = function (sText) {
-		return oResource.getText(sText);
-	};
 
 	return BreadcrumbsRenderer;
 

package/src/sap/m/BusyDialog.js

@@ -62,7 +62,7 @@ sap.ui.define(['./library',
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.100.0
 		 *
 		 * @public
 		 * @alias sap.m.BusyDialog

package/src/sap/m/BusyIndicator.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/BusyIndicatorRenderer.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} oBusyInd an object representation of the control that should be rendered
+		 * @param {sap.m.BusyIndicator} oBusyInd an object representation of the control that should be rendered
 		 */
 		BusyIndicatorRenderer.render = function(oRm, oBusyInd) {
 			var sTooltip = oBusyInd.getTooltip_AsString();

package/src/sap/m/Button.js

@@ -89,7 +89,7 @@ sap.ui.define([
 	 * @mixes sap.ui.core.ContextMenuSupport
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -760,7 +760,7 @@ sap.ui.define([
 				activeSrc : sActiveSrc,
 				densityAware : bIconDensityAware,
 
-				// do not use default tootip in icon as the button renders it's own tooltip
+				// do not use default tooltip in icon as the button renders it's own tooltip
 				useIconTooltip: false
 
 			}, sap.m.Image).addStyleClass("sapMBtnCustomIcon").setParent(this, null, true);

package/src/sap/m/ButtonRenderer.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.RenderManager} oRm
 	 *            the RenderManager that can be used for writing to
 	 *            the Render-Output-Buffer
-	 * @param {sap.ui.core.Control} oButton
+	 * @param {sap.m.Button} oButton
 	 *            the button to be rendered
 	 */
 	ButtonRenderer.render = function(oRm, oButton) {
@@ -238,7 +238,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.RenderManager} oRm
 	 *            the RenderManager that can be used for writing to
 	 *            the Render-Output-Buffer
-	 * @param {sap.ui.core.Control} oButton
+	 * @param {sap.m.Button} oButton
 	 *            the button to be rendered
 	 * @private
 	 */
@@ -269,7 +269,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.RenderManager} oRm
 	 *	      the RenderManager that can be used for writing to
 	 *	      the Render-Output-Buffer
-	 * @param {sap.ui.core.Control} oButton
+	 * @param {sap.m.Button} oButton
 	 *	      the button to be rendered
 	 * @param {sap.ui.core.URI} sURI
 	 *            URI of the icon to be written

package/src/sap/m/Carousel.js

@@ -13,7 +13,8 @@ sap.ui.define([
 	"sap/ui/Device",
 	"sap/ui/core/ResizeHandler",
 	"sap/ui/core/library",
-	"sap/m/MessagePage",
+	"sap/m/IllustratedMessage",
+	"sap/m/IllustratedMessageType",
 	"./CarouselRenderer",
 	"./CarouselLayout",
 	"sap/ui/events/KeyCodes",
@@ -29,7 +30,8 @@ sap.ui.define([
 	Device,
 	ResizeHandler,
 	coreLibrary,
-	MessagePage,
+	IllustratedMessage,
+	IllustratedMessageType,
 	CarouselRenderer,
 	CarouselLayout,
 	KeyCodes,
@@ -99,7 +101,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -166,7 +168,12 @@ sap.ui.define([
 			 * <b>Note:</b> When this property is used, the <code>loop</code> property is ignored.
 			 * @since 1.62
 			 */
-			customLayout: { type: "sap.m.CarouselLayout", multiple: false }
+			customLayout: { type: "sap.m.CarouselLayout", multiple: false },
+
+			/**
+			 * Message page, that is shown when no pages are loaded or provided
+			 */
+			_emptyPage: { type: "sap.m.IllustratedMessage", multiple: false, visibility: "hidden" }
 		},
 		associations : {
 
@@ -318,10 +325,6 @@ sap.ui.define([
 			ResizeHandler.deregister(this._sResizeListenerId);
 			this._sResizeListenerId = null;
 		}
-		if (this.oMessagePage) {
-			this.oMessagePage.destroy();
-			this.oMessagePage = null;
-		}
 		this.$().off('afterSlide');
 
 		this._fnAdjustAfterResize = null;
@@ -787,21 +790,20 @@ sap.ui.define([
 	};
 
 	/**
-	 * Private method that creates error message page when no pages are loaded
+	 * Private method that creates message page when no pages are loaded or provided
 	 *
 	 * @private
 	 */
-	Carousel.prototype._getErrorPage = function () {
-		if (!this.oMessagePage) {
-			this.oMessagePage = new MessagePage({
-				text: this._oRb.getText("CAROUSEL_ERROR_MESSAGE"),
-				description: "",
-				icon: "sap-icon://document",
-				showHeader: false
+	Carousel.prototype._getEmptyPage = function () {
+		if (!this.getAggregation("_emptyPage")) {
+			var emptyPage = new IllustratedMessage({
+				illustrationType: IllustratedMessageType.NoData
 			});
+
+			this.setAggregation("_emptyPage", emptyPage);
 		}
 
-		return this.oMessagePage;
+		return this.getAggregation("_emptyPage");
 	};
 
 	/**

package/src/sap/m/CarouselLayout.js

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/base/ManagedObject"], function (ManagedObject) {
 	 * Applies a <code>sap.m.CarouselLayout</code> to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *

package/src/sap/m/CarouselRenderer.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * Renders the Carousel's HTML, 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} oCarousel An object representation of the control that should be rendered
+	 * @param {sap.m.Carousel} oCarousel An object representation of the control that should be rendered
 	 */
 	CarouselRenderer.render = function (oRM, oCarousel){
 		var aPages = oCarousel.getPages(),
@@ -103,6 +103,10 @@ sap.ui.define([
 	CarouselRenderer._renderInnerDiv = function (oRM, oCarousel, aPages, sPageIndicatorPlacement) {
 		oRM.openStart("div").class("sapMCrslInner");
 
+		if (!aPages.length) {
+			oRM.class("sapMCrslInnerNoPages");
+		}
+
 		if (aPages.length > 1 && (oCarousel.getShowPageIndicator() || oCarousel.getArrowsPlacement() === CarouselArrowsPlacement.PageIndicator)) {
 
 			if (sPageIndicatorPlacement === PlacementType.Bottom) {
@@ -141,7 +145,7 @@ sap.ui.define([
 		if (aPages.length) {
 			aPages.forEach(fnRenderPage);
 		} else {
-			oRM.renderControl(oCarousel._getErrorPage());
+			oRM.renderControl(oCarousel._getEmptyPage());
 		}
 
 		oRM.close("div");
@@ -304,7 +308,8 @@ sap.ui.define([
 	 * effect with an offset for the page indicator.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRM The RenderManager that can be used for writing to the render output buffer
-	 * @param oPage the page to check
+	 * @param {sap.m.Carousel} oCarousel the carousel containg the page
+	 * @param {sap.ui.core.Control} oPage the page to check
 	 * @private
 	 */
 	CarouselRenderer._renderPageInScrollContainer = function (oRM, oCarousel, oPage) {

package/src/sap/m/CheckBox.js

@@ -13,8 +13,7 @@ sap.ui.define([
 	'sap/ui/core/EnabledPropagator',
 	'sap/ui/core/library',
 	'./CheckBoxRenderer',
-	"sap/ui/thirdparty/jquery",
-	"sap/ui/events/KeyCodes",
+	'sap/ui/events/KeyCodes',
 	'sap/ui/core/LabelEnablement',
 	'sap/ui/core/message/MessageMixin'
 ],
@@ -26,7 +25,6 @@ sap.ui.define([
 		EnabledPropagator,
 		coreLibrary,
 		CheckBoxRenderer,
-		jQuery,
 		KeyCodes,
 		LabelEnablement,
 		MessageMixin
@@ -88,7 +86,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -261,7 +259,6 @@ sap.ui.define([
 	 * Lifecycle Methods
 	 */
 	CheckBox.prototype.init = function() {
-		this.addActiveState(this);
 		this._handleReferencingLabels();
 	};
 
@@ -326,23 +323,6 @@ sap.ui.define([
 		return this;
 	};
 
-	/**
-	 * Add ActiveState to non-supported mobile platform
-	 * @private
-	 */
-	CheckBox.prototype.addActiveState = function(oControl) {
-		if (Device.os.blackberry) {
-			oControl.addDelegate({
-				ontouchstart: function(oEvent){
-					jQuery(oControl.getDomRef()).addClass("sapMActive");
-				},
-				ontouchend: function(oEvent){
-					jQuery(oControl.getDomRef()).removeClass("sapMActive");
-				}
-			});
-		}
-	};
-
 	CheckBox.prototype.getFormattedState = function() {
 		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
@@ -457,9 +437,7 @@ sap.ui.define([
 	 */
 	CheckBox.prototype._getLabel = function() {
 		if (!this._oLabel) {
-			this._oLabel = new Label(this.getId() + "-label", {
-				labelFor: this.getId()
-			}).addStyleClass("sapMCbLabel");
+			this._oLabel = new Label(this.getId() + "-label").addStyleClass("sapMCbLabel");
 
 			this.setAggregation("_label", this._oLabel, true);
 		}

package/src/sap/m/CheckBoxRenderer.js

@@ -26,7 +26,7 @@ sap.ui.define(['sap/ui/core/library', 'sap/ui/core/ValueStateSupport', 'sap/ui/D
 	 * 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} oCheckBox An object representation of the control that should be rendered
+	 * @param {sap.m.CheckBox} oCheckBox An object representation of the control that should be rendered
 	 */
 	CheckBoxRenderer.render = function(oRm, oCheckBox){
 		// get control properties

package/src/sap/m/ColorPalette.js

@@ -104,7 +104,7 @@ sap.ui.define([
 		 * To prevent this, apps using the <code>ColorPalette</code> should also load the <code>sap.ui.unified</code> library in advance.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.97.1
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ColorPalettePopover.js

@@ -38,7 +38,7 @@ sap.ui.define([
 		 * A thin wrapper over {@link sap.m.ColorPalette} allowing the latter to be used in a popover.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.97.1
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/Column.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -197,6 +197,15 @@ sap.ui.define([
 			 */
 			footer : {type : "sap.ui.core.Control", multiple : false}
 		},
+		associations: {
+			/**
+			 * Provides a menu that is used by the column.
+			 * The given menu has to follow the same pattern as the <code>sap.ui.core.IColumnHeaderMenu</code> interface.
+			 *
+			 * @since 1.98.0
+			 */
+			columnHeaderMenu: {type: "sap.ui.core.IColumnHeaderMenu", multiple: false, visibility: "hidden"}
+		},
 		designtime: "sap/m/designtime/Column.designtime"
 	}});
 
@@ -298,13 +307,12 @@ sap.ui.define([
 		this._media = oMedia;
 		this._media.matches = !!oMedia.from;
 
-		// make sure that the column is visible
-		if (!this.getVisible()) {
-			return;
-		}
-
 		// inform parent delayed
 		setTimeout(function() {
+			// make sure that the column is visible
+			if (!this.getVisible()) {
+				return;
+			}
 			this.fireEvent("media", this);
 			this.informTable("Resize");
 		}.bind(this), 0);
@@ -682,7 +690,7 @@ sap.ui.define([
 	// hence overwriting the getFocusDomRef to restore the focus on the active column header
 	Column.prototype.getFocusDomRef = function() {
 		var oParent = this.getParent();
-		if (oParent && (oParent.bActiveHeaders || oParent.bFocusableHeaders)) {
+		if (oParent && (oParent.bActiveHeaders || oParent.bFocusableHeaders || this.getAssociation("columnHeaderMenu"))) {
 			var oColumnDomRef = this.getDomRef();
 			if (oColumnDomRef) {
 				return oColumnDomRef.firstChild;
@@ -706,6 +714,17 @@ sap.ui.define([
 		this._setMinScreenWidth(bForcedColumn ? "" : this.getMinScreenWidth());
 	};
 
+	/**
+	 * Returns the <code>sap.ui.core.IColumnHeaderMenu<\code>, which is the current target of the association <code>columnHeaderMenu</code>, or null.
+	 *
+	 * @returns {sap.ui.core.IColumnHeaderMenu}
+	 * @since 1.98.0
+	 * @public
+	 */
+	Column.prototype.getColumnHeaderMenu = function () {
+		return sap.ui.getCore().byId(this.getAssociation("columnHeaderMenu"));
+	};
+
 	return Column;
 
 });

package/src/sap/m/ColumnHeaderPopover.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.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.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ColumnListItemRenderer.js

@@ -29,6 +29,15 @@ sap.ui.define([
 	var ColumnListItemRenderer = Renderer.extend(ListItemBaseRenderer);
 	ColumnListItemRenderer.apiVersion = 2;
 
+	/**
+	 * Renders the HTML for the given control, using the provided
+	 * {@link sap.ui.core.RenderManager}.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm
+	 *            RenderManager that can be used to render the control's DOM
+	 * @param {sap.m.ColumnListItem} oLI
+	 *            The item to be rendered
+	 */
 	ColumnListItemRenderer.render = function(rm, oLI) {
 		var oTable = oLI.getTable();
 		if (!oTable) {
@@ -106,17 +115,6 @@ sap.ui.define([
 		return "";
 	};
 
-	/**
-	 * Renders the HTML for the given control, using the provided
-	 * {@link sap.ui.core.RenderManager}.
-	 *
-	 * @param {sap.ui.core.RenderManager}
-	 *            oRenderManager 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
-	 */
 	ColumnListItemRenderer.renderLIAttributes = function(rm, oLI) {
 		rm.class("sapMListTblRow");
 		var vAlign = oLI.getVAlign();
@@ -311,6 +309,10 @@ sap.ui.define([
 			rm.openStart("div");
 			rm.class("sapMListTblSubCntRow");
 
+			if (sPopinDisplay == PopinDisplay.Inline) {
+				rm.class("sapMListTblSubCntRowInline");
+			}
+
 			aStyleClass && aStyleClass.forEach(function(sClassName) {
 				rm.class(sClassName);
 			});
@@ -323,10 +325,9 @@ sap.ui.define([
 				oColumn.addDependent(oHeader);
 				oLI._addClonedHeader(oHeader);
 				rm.renderControl(oHeader);
-				rm.close("div");
-
-				rm.openStart("div").class("sapMListTblSubCntSpr").openEnd();
-				rm.text(Core.getLibraryResourceBundle("sap.m").getText("TABLE_POPIN_LABEL_COLON"));
+				rm.openStart("span").class("sapMListTblSubCntSpr");
+				rm.attr("data-popin-colon", Core.getLibraryResourceBundle("sap.m").getText("TABLE_POPIN_LABEL_COLON"));
+				rm.openEnd().close("span");
 				rm.close("div");
 			}
 

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.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @since 1.63