@openui5/sap.m 1.102.0 → 1.102.4

package/src/sap/m/FeedInput.js

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

package/src/sap/m/FeedListItem.js

@@ -54,7 +54,7 @@ function(
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.102.0
+	 * @version 1.102.4
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedListItemAction.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Element"],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.102.0
+	 * @version 1.102.4
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Fiori20Adapter.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @class text
-	 * @version 1.102.0
+	 * @version 1.102.4
 	 * @private
 	 * @since 1.38
 	 * @alias HeaderAdapter
@@ -227,7 +227,7 @@ sap.ui.define([
 	 * Constructor for an sap.m.Fiori20Adapter.
 	 *
 	 * @class text
-	 * @version 1.102.0
+	 * @version 1.102.4
 	 * @private
 	 * @since 1.38
 	 * @alias sap.m.Fiori20Adapter

package/src/sap/m/FlexBox.js

@@ -62,7 +62,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.102.0
+	 * @version 1.102.4
 	 *
 	 * @public
 	 * @alias sap.m.FlexBox

package/src/sap/m/FlexItemData.js

@@ -24,7 +24,7 @@ sap.ui.define(["./FlexBoxStylingHelper", "./library", "sap/ui/core/LayoutData"],
 	 * @class
 	 * Holds layout data for a FlexBox / HBox / VBox.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.102.0
+	 * @version 1.102.4
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FormattedText.js

@@ -44,7 +44,7 @@ function(
 		 * @class
 		 * The FormattedText control allows the usage of a limited set of tags for inline display of formatted text in HTML format.
 		 * @extends sap.ui.core.Control
-		 * @version 1.102.0
+		 * @version 1.102.4
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/GenericTag.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.102.0
+	 * @version 1.102.4
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/GenericTile.js

@@ -20,6 +20,7 @@ sap.ui.define([
 	"sap/base/strings/camelize",
 	"sap/base/util/deepEqual",
 	"sap/ui/events/PseudoEvents",
+	"sap/ui/core/theming/Parameters",
 	"sap/ui/thirdparty/jquery"
 ], function (
 	library,
@@ -37,6 +38,7 @@ sap.ui.define([
 	camelize,
 	deepEqual,
 	PseudoEvents,
+	Parameters,
 	jQuery
 ) {
 	"use strict";
@@ -64,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.102.0
+	 * @version 1.102.4
 	 * @since 1.34.0
 	 *
 	 * @public
@@ -208,10 +210,14 @@ sap.ui.define([
 				backgroundColor: {type: "sap.ui.core.CSSColor", group: "Appearance"},
 				/**
 				 * The semantic color of the value.
-				 * @experimental
+				 * @experimental Since 1.95
 				 * @since 1.95
 				 */
-				valueColor: {type: "sap.m.ValueColor", group: "Appearance", defaultValue: "None"}
+				valueColor: {type: "sap.m.ValueColor", group: "Appearance", defaultValue: "None"},
+				/**
+				 * The load state of the tileIcon.
+				 */
+				iconLoaded: {type: "boolean", group: "Misc", defaultValue: true}
 			},
 			defaultAggregation: "tileContent",
 			aggregations: {
@@ -424,13 +430,19 @@ sap.ui.define([
 	 */
 	GenericTile.prototype._initScopeContent = function (sTileClass) {
 		if (!this.getState || this.getState() !== LoadState.Disabled) {
+			if (this._oMoreIcon) {
+				//It destroys the existing button when the Tile is getting rendered more than once
+				this._oMoreIcon.destroy();
+				this._oMoreIcon = null;
+			}
 			if (this.isA("sap.m.GenericTile") && this._isIconMode() && this.getFrameType() === FrameType.TwoByHalf){
 				// Acts Like an actual Button in Icon mode for TwoByHalf Tile
 				this._oMoreIcon = this._oMoreIcon || new Button({
 					id: this.getId() + "-action-more",
 					icon: "sap-icon://overflow",
-					type: "Transparent"
-				}).addStyleClass("sapMPointer").addStyleClass(sTileClass + "MoreIcon");
+					type: "Transparent",
+					tooltip :this._oRb.getText("GENERICTILE_MORE_ACTIONBUTTON_TEXT")
+				}).addStyleClass("sapMPointer").addStyleClass(sTileClass + "MoreIcon").addStyleClass(sTileClass + "ActionMoreButton");
 				this._oMoreIcon.ontouchstart = function() {
 					this.removeFocus();
 				}.bind(this);
@@ -625,8 +637,28 @@ sap.ui.define([
 			this._addClassesForButton();
 		}
 
+		//Adds Extra height to the TileContent when GenericTile is in ActionMode
+		if (this.getFrameType()  === FrameType.TwoByOne && this.getMode() === GenericTileMode.ActionMode && this.getState() === LoadState.Loaded) {
+			this._applyExtraHeight();
+		}
+
 		this.onDragComplete();
 	};
+	/**
+	 * Increases the height of the TileContent when the header-text has one line
+	 * @private
+	 */
+	GenericTile.prototype._applyExtraHeight = function(){
+		var iHeight = this.getDomRef("hdr-text").offsetHeight,
+			iLineHeight = parseInt(getComputedStyle(this.getDomRef("title")).lineHeight.slice(0,2)),
+			iHeaderLines = Math.ceil(iHeight / iLineHeight);
+		if (iHeaderLines === 1 && !this.getHeaderImage()) {
+			this.getDomRef("content").classList.add("sapMGTFtrMarginTop");
+		} else {
+			this.getDomRef("content").classList.remove("sapMGTFtrMarginTop");
+		}
+	};
+
 	GenericTile.prototype._setMaxLines = function() {
 		var sFrameType = this.getFrameType(),
 			iLines = sFrameType === FrameType.OneByOne || sFrameType === FrameType.TwoByHalf ? 1 : 2;
@@ -1276,14 +1308,16 @@ sap.ui.define([
 		var aContent = this.getTileContent();
 		var sAdditionalTooltip = this.getAdditionalTooltip();
 
-		if (!this._isInActionScope() && (this.getMode() === GenericTileMode.ContentMode || this.getMode() === GenericTileMode.ArticleMode)) {
+		if (!this._isInActionScope() && (this.getMode() === GenericTileMode.ContentMode || this.getMode() === GenericTileMode.ArticleMode || this.getMode() === GenericTileMode.ActionMode)) {
 			for (var i = 0; i < aContent.length; i++) {
-				if (typeof aContent[i]._getAriaAndTooltipText === "function") {
-					sText += (bIsFirst ? "" : "\n") + aContent[i]._getAriaAndTooltipText();
-				} else if (aContent[i].getTooltip_AsString()) {
-					sText += (bIsFirst ? "" : "\n") + aContent[i].getTooltip_AsString();
+				if (aContent[i].getVisible()){
+					if (typeof aContent[i]._getAriaAndTooltipText === "function") {
+						sText += (bIsFirst ? "" : "\n") + aContent[i]._getAriaAndTooltipText();
+					} else if (aContent[i].getTooltip_AsString()) {
+						sText += (bIsFirst ? "" : "\n") + aContent[i].getTooltip_AsString();
+					}
+					bIsFirst = false;
 				}
-				bIsFirst = false;
 			}
 		}
 
@@ -1514,7 +1548,7 @@ sap.ui.define([
 			$Tile.attr("aria-label", sAriaText);
 		}
 		if (this._isInActionScope()) {
-			$Tile.find('*:not(.sapMGTRemoveButton)').removeAttr("aria-label").removeAttr("title").off("mouseenter");
+			$Tile.find('*:not(.sapMGTRemoveButton,.sapMGTActionMoreButton)').removeAttr("aria-label").removeAttr("title").off("mouseenter");
 		} else {
 			$Tile.find('*').removeAttr("aria-label").removeAttr("title").off("mouseenter");
 		}
@@ -1652,14 +1686,32 @@ sap.ui.define([
 	 */
 	GenericTile.prototype._isIconMode = function () {
 		if (this.getMode() === GenericTileMode.IconMode
-			&& (this.getFrameType() === FrameType.OneByOne || this.getFrameType() === FrameType.TwoByHalf)
-			&& this.getBackgroundColor() && this.getTileIcon()){
-			return true;
+			&& (this.getFrameType() === FrameType.OneByOne || this.getFrameType() === FrameType.TwoByHalf)){
+				if (!this.getBackgroundColor() && this.getFrameType() === FrameType.TwoByHalf) {
+					this._setDefaultBackgroundColor();
+				}
+				if (this.getTileIcon() && this.getBackgroundColor()) {
+					return true;
+				} else {
+					if (!this.getIconLoaded()) {
+						return true;
+					} else {
+						return false;
+					}
+				}
 		} else {
 			return false;
 		}
 	};
 
+	/**
+	 * Sets the default background color when the tile is in iconmode.
+	 */
+	GenericTile.prototype._setDefaultBackgroundColor = function() {
+		var sColor = Parameters.get("sapUiContentPlaceholderloadingBackground");
+		this.setProperty("backgroundColor" , sColor, true);
+	};
+
 	/**
 	 * Checks if Navigate Action Button should be used in Article Mode
 	 * @returns {boolean} - true if Navigate Action Button is enabled

package/src/sap/m/GenericTileRenderer.js

@@ -50,7 +50,7 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 		var isHalfFrame = frameType === frameTypes.OneByHalf || frameType === frameTypes.TwoByHalf;
 
 		// Render a link when URL is provided, not in action scope and the state is enabled
-		var bRenderLink = oControl.getUrl() && !oControl._isInActionScope() && sState !== LoadState.Disabled && !oControl._isNavigateActionEnabled() && !oControl._isActionMode();
+		var bRenderLink = oControl.getUrl() && (!oControl._isInActionScope() || oControl.getMode() === GenericTileMode.IconMode) && sState !== LoadState.Disabled && !oControl._isNavigateActionEnabled() && !oControl._isActionMode();
 
 		if (oControl._isInActionScope()) {
 			sScopeClass = encodeCSS("sapMGTScopeActions");
@@ -159,46 +159,56 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 		var iLength = aTileContent.length;
 		var isFooterPresent = false;
 		var isContentPresent = false;
-		if (sState === LoadState.Loading) {
-			//Setplaceholders for IconMode.
-			if ( oControl._isIconMode() ) {
-				if (frameType === frameTypes.OneByOne) {
-					oRm.openStart("div").class("sapMGTContentShimmerPlaceholderItemOneByOne");
-					oRm.class("sapMGTContentShimmerPlaceholderWithDescriptionOneByOne");
-					oRm.openEnd();
-					oRm.openStart("div")
-						.class("sapMGTContentShimmerPlaceholderRowsOneByOne")
-						.openEnd();
-					oRm.openStart("div")
-						.class("sapMGTContentShimmerPlaceholderIconOneByOne")
-						.class("sapMGTLoadingShimmer")
-						.openEnd()
-						.close("div");
-					oRm.openStart("div")
-						.class("sapMGTContentShimmerPlaceholderItemTextOneByOne")
-						.class("sapMGTLoadingShimmer")
-						.openEnd()
-						.close("div");
-				} else {
-					oRm.openStart("div").class("sapMGTContentShimmerPlaceholderItemTwoByHalf");
-					oRm.class("sapMGTContentShimmerPlaceholderWithDescriptionTwoByHalf");
-					oRm.openEnd();
-					oRm.openStart("div")
-						.class("sapMGTContentShimmerPlaceholderRowsTwoByHalf")
-						.openEnd();
+		function renderLoadingShimmerIconMode(oRm, bIsLoading) {
+			if (frameType === frameTypes.OneByOne) {
+				oRm.openStart("div").class("sapMGTContentShimmerPlaceholderItemOneByOne");
+				oRm.class("sapMGTContentShimmerPlaceholderWithDescriptionOneByOne");
+				oRm.openEnd();
+				oRm.openStart("div")
+					.class("sapMGTContentShimmerPlaceholderRowsOneByOne")
+					.openEnd();
+				oRm.openStart("div")
+					.class("sapMGTContentShimmerPlaceholderIconOneByOne")
+					.class("sapMGTLoadingShimmer")
+					.openEnd()
+					.close("div");
+				if (bIsLoading){
 					oRm.openStart("div")
-						.class("sapMGTContentShimmerPlaceholderIconTwoByHalf")
-						.class("sapMGTLoadingShimmer")
-						.openEnd()
-						.close("div");
+					.class("sapMGTContentShimmerPlaceholderItemTextOneByOne")
+					.class("sapMGTLoadingShimmer")
+					.openEnd()
+					.close("div");
+				}
+			} else {
+				oRm.openStart("div").class("sapMGTContentShimmerPlaceholderItemTwoByHalf");
+				oRm.class("sapMGTContentShimmerPlaceholderWithDescriptionTwoByHalf");
+				if (!oControl.getIconLoaded() && !bIsLoading) {
+					oRm.class("sapMGTContentShimmerPlaceholderWithDescriptionTwoByHalfIconLoaded");
+				}
+				oRm.openEnd();
+				oRm.openStart("div")
+					.class("sapMGTContentShimmerPlaceholderRowsTwoByHalf")
+					.openEnd();
+				oRm.openStart("div")
+					.class("sapMGTContentShimmerPlaceholderIconTwoByHalf")
+					.class("sapMGTLoadingShimmer")
+					.openEnd()
+					.close("div");
+				if (bIsLoading){
 					oRm.openStart("div")
-						.class("sapMGTContentShimmerPlaceholderItemTextTwoByHalf")
-						.class("sapMGTLoadingShimmer")
-						.openEnd()
-						.close("div");
+					.class("sapMGTContentShimmerPlaceholderItemTextTwoByHalf")
+					.class("sapMGTLoadingShimmer")
+					.openEnd()
+					.close("div");
 				}
-				oRm.close("div");
-				oRm.close("div");
+			}
+			oRm.close("div");
+			oRm.close("div");
+		}
+		if (sState === LoadState.Loading) {
+			//Setplaceholders for IconMode.
+			if (oControl._isIconMode()) {
+				renderLoadingShimmerIconMode(oRm, true);
 			} else {
 				oRm.openStart("div").class("sapMGTContentShimmerPlaceholderItem");
 				oRm.class("sapMGTContentShimmerPlaceholderWithDescription");
@@ -225,7 +235,7 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 				oRm.close("div");
 			}
 		} else {
-			if (this._isValueColorValid(oControl.getValueColor())) {
+			if (!bIsActionMode && this._isValueColorValid(oControl.getValueColor())) {
 				oRm.openStart("div");
 				oRm.class("sapMGTCriticalBorder");
 				oRm.class(oControl.getValueColor());
@@ -234,27 +244,31 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 			}
 			//Set respective Class/ BackgroundColor for IconMode
 			if (oControl._isIconMode()) {
-				oRm.openStart("div");
-				if (frameType === frameTypes.OneByOne) {
-					oRm.class("sapMGTOneByOneIcon");
+				if (!oControl.getIconLoaded()) {
+					renderLoadingShimmerIconMode(oRm, false);
 				} else {
-					oRm.class("sapMGTTwoByHalfIcon");
-					if (!this._isThemeHighContrast()) {
-						oRm.style("background-color", oControl.getBackgroundColor());
+					oRm.openStart("div");
+					if (frameType === frameTypes.OneByOne) {
+						oRm.class("sapMGTOneByOneIcon");
 					} else {
-						oRm.class("HighContrastTile");
-						oRm.style("border-color", oControl.getBackgroundColor());
-						oRm.style("box-shadow", "0 0 0 1px" + oControl.getBackgroundColor());
+						oRm.class("sapMGTTwoByHalfIcon");
+						if (!this._isThemeHighContrast()) {
+							oRm.style("background-color", oControl.getBackgroundColor());
+						} else {
+							oRm.class("HighContrastTile");
+							oRm.style("border-color", oControl.getBackgroundColor());
+							oRm.style("box-shadow", "0 0 0 1px" + oControl.getBackgroundColor());
+						}
 					}
-				}
-				oRm.openEnd();
-				if (oControl.getTileIcon()) {
-					var sAggregation = oControl._generateIconAggregation(oControl.getTileIcon());
-					if (sAggregation) {
-						oRm.renderControl(oControl.getAggregation(sAggregation));
+					oRm.openEnd();
+					if (oControl.getTileIcon()) {
+						var sAggregation = oControl._generateIconAggregation(oControl.getTileIcon());
+						if (sAggregation) {
+							oRm.renderControl(oControl.getAggregation(sAggregation));
+						}
 					}
+					oRm.close("div");
 				}
-				oRm.close("div");
 			}
 
 			//Wrapper div for adjusting to Info Container
@@ -268,6 +282,9 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 			if (oControl._isIconMode() ){
 				if (frameType === frameTypes.OneByOne) {
 					var sClass = "sapMGTOneByOne";
+					if (!oControl.getIconLoaded()) {
+						sClass = sClass.concat(" sapMGTOneByOneIconLoaded");
+					}
 				} else if (frameType === frameTypes.TwoByHalf) {
 					var sClass = "TwoByHalf";
 				}
@@ -276,6 +293,9 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 			if (sTooltipText) {
 				oRm.attr("title", sTooltipText);
 			}
+			if (bIsActionMode && oControl.getFrameType() === frameTypes.TwoByOne && sHeaderImage) {
+				oRm.class("sapMGTHdrImage");
+			}
 			oRm.openEnd();
 
 			//Render Header Image

package/src/sap/m/GroupHeaderListItem.js

@@ -30,7 +30,7 @@ sap.ui.define(["sap/ui/core/library", "./library", "./ListItemBase", "./GroupHea
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.102.0
+	 * @version 1.102.4
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/GrowingEnablement.js

@@ -14,7 +14,8 @@ sap.ui.define([
 	'sap/ui/core/HTML',
 	'sap/m/CustomListItem',
 	'sap/base/security/encodeXML',
-	'sap/base/util/UriParameters'
+	'sap/ui/core/Core',
+	"sap/ui/thirdparty/jquery"
 ],
 	function(
 		BaseObject,
@@ -25,7 +26,8 @@ sap.ui.define([
 		HTML,
 		CustomListItem,
 		encodeXML,
-		UriParameters
+		Core,
+		jQuery
 	) {
 	"use strict";
 
@@ -70,7 +72,7 @@ sap.ui.define([
 			this._aChunk = [];
 			this._oRM = null;
 
-			if (UriParameters.fromQuery(window.location.href).get("sap-ui-xx-enableItemsPool") === "true") {
+			if (document.location.href.search("sap-ui-xx-enableItemsPool") > 0) {
 				this._aItemsPool = [];
 			}
 		},
@@ -130,14 +132,43 @@ sap.ui.define([
 			}
 		},
 
+		onsapdown: function(oEvent) {
+			// Navigate from last item to growing trigger and vice versa via arrow keys
+			var oControl = this._oControl;
+			if (oControl._oItemNavigation && !oEvent.isMarked()) {
+				var aItemDomRefs = oControl._oItemNavigation.getItemDomRefs();
+				var sDir = oControl.getGrowingDirection();
+				if ((sDir != ListGrowingDirection.Upwards && oEvent.type == "sapdown" && oEvent.target === aItemDomRefs[aItemDomRefs.length - 1])
+						|| (sDir == ListGrowingDirection.Upwards && oEvent.type == "sapup" && oEvent.target === aItemDomRefs[0])) {
+					var $Trigger = oControl.$("trigger");
+					$Trigger.trigger("focus");
+					oEvent.setMarked();
+					oEvent.stopImmediatePropagation(); // to prevent ItemNavigation
+				} else if ((sDir == ListGrowingDirection.Upwards && oEvent.type == "sapdown")
+						|| (sDir != ListGrowingDirection.Upwards && oEvent.type == "sapup")
+						&& oEvent.target === oControl.getDomRef("trigger")) {
+					jQuery(aItemDomRefs[oEvent.type == "sapdown" ? 0 : aItemDomRefs.length - 1]).trigger("focus");
+					oEvent.setMarked();
+				}
+			}
+		},
+
+		onsapup: function(oEvent) {
+			return this.onsapdown(oEvent);
+		},
+
 		setTriggerText : function(sText) {
 			this._oControl.$("triggerText").text(sText);
 		},
 
 		// reset paging on rebind
-		reset : function() {
+		reset : function(bPageSizeOnly) {
 			this._iLimit = 0;
 
+			if (bPageSizeOnly) {
+				return;
+			}
+
 			// if factory function is used we do not activate the replace option of the extended change detection
 			var oBindingInfo = this._oControl.getBindingInfo("items");
 			this._oControl.oExtendedChangeDetectionConfig = (!oBindingInfo || !oBindingInfo.template) ? null : {replace: true};
@@ -227,7 +258,7 @@ sap.ui.define([
 			var sTriggerID = this._oControl.getId() + "-trigger",
 				sTriggerText = this._oControl.getGrowingTriggerText();
 
-			sTriggerText = sTriggerText || sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("LOAD_MORE_DATA");
+			sTriggerText = sTriggerText || Core.getLibraryResourceBundle("sap.m").getText("LOAD_MORE_DATA");
 			this._oControl.addNavSection(sTriggerID);
 
 			if (this._oTrigger) {
@@ -246,6 +277,7 @@ sap.ui.define([
 										'<span class="sapMSLITitle" id="' + sTriggerID + 'Text">' + encodeXML(sTriggerText) + '</span>' +
 									'</div>' +
 									'<div class="sapMGrowingListDescription sapMSLIDescription" id="' + sTriggerID + 'Info"></div>' +
+									'<div class="sapUiInvisibleText" id="' + sTriggerID + 'Message"></div>' +
 								'</div>'
 				})
 			}).setParent(this._oControl, null, true).attachPress(this.requestNewPage, this).addDelegate({
@@ -265,7 +297,8 @@ sap.ui.define([
 					$oTrigger.attr({
 						"tabindex": 0,
 						"role": "button",
-						"aria-labelledby": sTriggerID + "Text" + " " + sTriggerID + "Info"
+						"aria-labelledby": sTriggerID + "Text",
+						"aria-describedby": sTriggerID + "Message"
 					});
 				}
 			}, this);
@@ -280,7 +313,14 @@ sap.ui.define([
 
 		// returns the growing information to be shown at the growing button
 		_getListItemInfo : function() {
-			return ("[ " + this._iRenderedDataItems + " / " + NumberFormat.getFloatInstance().format(this._oControl.getMaxItemsCount()) + " ]");
+			var aCounts = this._getItemCounts();
+			var oFormat = NumberFormat.getFloatInstance();
+			return "[ " + oFormat.format(aCounts[0]) + " / " + oFormat.format(aCounts[1]) + " ]";
+		},
+
+		// returns the item counts for the growing information (current vs. total)
+		_getItemCounts : function() {
+			return [this._iRenderedDataItems, this._oControl.getMaxItemsCount()];
 		},
 
 		// returns the first sorters grouping path when available
@@ -419,16 +459,29 @@ sap.ui.define([
 
 		// render all the collected items in the chunk and flush them into the DOM
 		// vInsert whether to append (true) or replace (falsy) or to insert at a certain position (int)
-		applyChunk : function(vInsert) {
+		applyChunk : function(vInsert, bAsync) {
 			if (!this._oControl) {
 				return;
 			}
 
 			this.applyPendingGroupItem();
 
+			var iTimer = this._iChunkTimer;
 			var iLength = this._aChunk.length;
 			var oDomRef = this._oControl.getItemsContainerDomRef();
+
+			if (iTimer) {
+				this._iChunkTimer = clearTimeout(iTimer);
+			}
+
 			if (!iLength || !oDomRef || !this._oControl.shouldRenderItems()) {
+				this._aChunk = [];
+				return;
+			}
+
+			if (iTimer && !bAsync) {
+				this._oControl.invalidate();
+				this._aChunk = [];
 				return;
 			}
 
@@ -441,7 +494,7 @@ sap.ui.define([
 				}
 			}
 
-			this._oRM = this._oRM || sap.ui.getCore().createRenderManager();
+			this._oRM = this._oRM || Core.createRenderManager();
 			for (var i = 0; i < iLength; i++) {
 				this._oRM.renderControl(this._aChunk[i]);
 			}
@@ -454,8 +507,8 @@ sap.ui.define([
 
 		// async version of applyChunk
 		applyChunkAsync : function(vInsert) {
-			if (this._bNonClientModel) {
-				setTimeout(this.applyChunk.bind(this, vInsert));
+			if (this._bApplyChunkAsync) {
+				this._iChunkTimer = setTimeout(this.applyChunk.bind(this, vInsert, true));
 			} else {
 				this.applyChunk(vInsert);
 			}
@@ -496,23 +549,26 @@ sap.ui.define([
 		 * refresh items only for OData model.
 		 */
 		refreshItems : function(sChangeReason) {
-			this._bNonClientModel = true;
+			var oControl = this._oControl;
+			var oBinding = oControl.getBinding("items");
+
+			// the value of the ODataV4PropertyBinding created during the template clone gets resolved asynchronously
+			this._bApplyChunkAsync = oBinding.isA("sap.ui.model.odata.v4.ODataListBinding") && oControl.checkGrowingFromScratch();
+
+			// if the data is not already requested then let the updateStarted event to be fired
 			if (!this._bDataRequested) {
 				this._bDataRequested = true;
 				this._onBeforePageLoaded(sChangeReason);
 			}
 
 			// set iItemCount to initial value if not set or no items at the control yet
-			if (!this._iLimit || this.shouldReset(sChangeReason) || !this._oControl.getItems(true).length) {
-				this._iLimit = this._oControl.getGrowingThreshold();
-
+			if (!this._iLimit || this.shouldReset(sChangeReason) || !oControl.getItems(true).length) {
+				this._iLimit = oControl.getGrowingThreshold();
 			}
 
-			// send the request to get the context
-			var oBinding = this._oControl.getBinding("items");
-
+			// pre-initialize items during the request is ongoing
 			if (this._aItemsPool) {
-				if (this._oControl._bBusy) {
+				if (oControl._bBusy) {
 					setTimeout(this.fillItemsPool.bind(this));
 				} else {
 					oBinding.attachEventOnce("dataRequested", function() {
@@ -521,6 +577,7 @@ sap.ui.define([
 				}
 			}
 
+			// send the request to get the context
 			oBinding.getContexts(0, this._iLimit);
 		},
 
@@ -727,6 +784,10 @@ sap.ui.define([
 				} else {
 					if (bLengthFinal) {
 						oControl.$("triggerInfo").css("display", "block").text(this._getListItemInfo());
+						var aCounts = this._getItemCounts();
+						oControl.$("triggerMessage").text(Core.getLibraryResourceBundle("sap.m").getText("LOAD_MORE_DATA_ACC_WITH_COUNT", aCounts));
+					} else {
+						oControl.$("triggerMessage").text(Core.getLibraryResourceBundle("sap.m").getText("LOAD_MORE_DATA_ACC"));
 					}
 
 					oControl.$("triggerList").css("display", "");

package/src/sap/m/GrowingList.js

@@ -22,7 +22,7 @@ sap.ui.define(['./List', './library', './GrowingListRenderer'],
 	 * @extends sap.m.List
 	 *
 	 * @author SAP SE
-	 * @version 1.102.0
+	 * @version 1.102.4
 	 *
 	 * @constructor
 	 * @public