@openui5/sap.m 1.95.0 → 1.96.0

package/src/sap/m/NavContainer.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public
@@ -1815,21 +1815,28 @@ sap.ui.define([
 	 * Shows the placeholder if NavContainer is rendered.
 	 * Otherwise, registers the 'onAfterRendering' delegate which shows the placeholder.
 	 *
-	 * @param {object} mSettings Object containing the placeholder instance
+	 * @param {object} [mSettings] Object containing the placeholder instance.
+	 *                             Can be omitted if a placeholder instance is already created by <code>sap.ui.core.routing.async.Target</code>.
+	 * @param {object} [mSettings.placeholder] The placeholder instance
 	 * @param {sap.ui.core.Placeholder} mSettings.placeholder The placeholder instance
 	 * @return {Promise} Promise that resolves with the placeholder
 	 *
-	 * @public
+	 * @private
+	 * @ui5-restricted SAPUI5 Distribution libraries only
 	 * @since 1.91
 	 */
 	NavContainer.prototype.showPlaceholder = function(mSettings) {
 		var pLoaded;
 
+		if (!sap.ui.getCore().getConfiguration().getPlaceholder()) {
+			return;
+		}
+
 		if (this._placeholder) {
 			this.hidePlaceholder();
 		}
 
-		if (mSettings.placeholder) {
+		if (mSettings && mSettings.placeholder) {
 			this._placeholder = mSettings.placeholder;
 			pLoaded = this._placeholder._load();
 		} else {
@@ -1848,7 +1855,8 @@ sap.ui.define([
 	/**
 	 * Hides the placeholder and removes the 'onAfterRendering' placeholder delegate.
 	 *
-	 * @public
+	 * @private
+	 * @ui5-restricted SAP internal apps
 	 * @since 1.91
 	 */
 	NavContainer.prototype.hidePlaceholder = function() {

package/src/sap/m/NewsContent.js

@@ -8,11 +8,12 @@ sap.ui.define([
 	'./library',
 	'sap/ui/core/Control',
 	'sap/m/Text',
+	'sap/m/FormattedText',
 	'sap/ui/Device',
 	'./NewsContentRenderer',
 	"sap/ui/events/KeyCodes"
 ],
-	function(library, Control, Text, Device, NewsContentRenderer, KeyCodes) {
+	function(library, Control, Text, FormattedText, Device, NewsContentRenderer, KeyCodes) {
 	"use strict";
 
 	/**
@@ -25,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 * @since 1.34
 	 *
 	 * @public
@@ -56,7 +57,11 @@ sap.ui.define([
 				/**
 				 * The hidden aggregation for the content text.
 				 */
-				"_contentText" : {type : "sap.m.Text", multiple : false, visibility : "hidden"}
+				"_contentText" : {type : "sap.m.FormattedText", multiple : false, visibility : "hidden"},
+				/**
+				 * The hidden aggregation for the subHeader text.
+				 */
+				 "_subHeaderText" : {type : "sap.m.FormattedText", multiple : false, visibility : "hidden"}
 			},
 			events : {
 				/**
@@ -73,11 +78,10 @@ sap.ui.define([
 	* Init function for the control
 	*/
 	NewsContent.prototype.init = function() {
-		this._oContentText = new Text(this.getId() + "-content-text", {
-			maxLines : 2
-		});
-		this._oContentText.cacheLineHeight = false;
+		this._oContentText = new FormattedText(this.getId() + "-content-text");
+		this._oSubHeaderText = new FormattedText(this.getId() + "-subheader-text");
 		this.setAggregation("_contentText", this._oContentText, true);
+		this.setAggregation("_subHeaderText", this._oSubHeaderText, true);
 		this.setTooltip("{AltText}");
 	};
 
@@ -131,8 +135,8 @@ sap.ui.define([
 	NewsContent.prototype.getAltText = function() {
 		var sAltText = "";
 		var bIsFirst = true;
-		if (this.getAggregation("_contentText").getText()) {
-			sAltText += this.getAggregation("_contentText").getText();
+		if (this.getContentText()) {
+			sAltText += this.getContentText();
 			bIsFirst = false;
 		}
 		if (this.getSubheader()) {
@@ -160,10 +164,15 @@ sap.ui.define([
 	};
 
 	NewsContent.prototype.setContentText = function(text) {
-		this._oContentText.setText(text);
+		this._oContentText.setHtmlText(text);
 		return this.setProperty("contentText", text, true);
 	};
 
+	NewsContent.prototype.setSubheader = function(text) {
+		this._oSubHeaderText.setHtmlText(text);
+		return this.setProperty("subheader", text, true);
+	};
+
 	/* --- Event Handling --- */
 
 	/**

package/src/sap/m/NewsContentRenderer.js

@@ -23,7 +23,6 @@ sap.ui.define([],
 	 * @param {sap.m.GenericTile} oControl the control to be rendered
 	 */
 	NewsContentRenderer.render = function(oRm, oControl) {
-		var sSubheader = oControl.getSubheader();
 		var sTooltip = oControl.getTooltip_AsString();
 		if (typeof sTooltip !== "string") {
 			sTooltip = "";
@@ -49,7 +48,7 @@ sap.ui.define([],
 		oRm.openStart("div", oControl.getId() + "-subheader");
 		oRm.class("sapMNwCSbh");
 		oRm.openEnd();
-		oRm.text(sSubheader);
+		oRm.renderControl(oControl._oSubHeaderText);
 		oRm.close("div");
 		oRm.close("div");
 	};

package/src/sap/m/NotificationList.js

@@ -27,7 +27,7 @@ function(
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NotificationListBase.js

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

package/src/sap/m/NotificationListGroup.js

@@ -66,7 +66,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NotificationListItem.js

@@ -66,7 +66,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NumericContent.js

@@ -107,7 +107,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/NumericContentRenderer.js

@@ -184,28 +184,45 @@ sap.ui.define([
 		oRm.class(oControl.getState());
 		oRm.openEnd();
 
-		var oMaxDigitsData = oControl._getMaxDigitsData();
-		this._prepareAndRenderIcon(oRm, oControl, oControl._oIcon, oMaxDigitsData.fontClass);
-
-		var iChar = oControl.getTruncateValueTo() || oMaxDigitsData.maxLength;
-	    oRm.openStart("span" , oControl.getId() + "-value-inner");
-		if (oMaxDigitsData.fontClass) {
-			oRm.class(oMaxDigitsData.fontClass);
-		}
-		oRm.openEnd();
+		if (oControl.getState() === LoadState.Loading) {
+			oRm.openStart("div").class("sapMNCContentShimmerPlaceholderItem");
+			oRm.openEnd();
+			oRm.openStart("div")
+				.class("sapMNCContentShimmerPlaceholderRows")
+				.openEnd();
+			oRm.openStart("div")
+				.class("sapMNCContentShimmerPlaceholderItemHeader")
+				.class("sapMNCLoadingShimmer")
+				.openEnd()
+				.close("div");
 
-		//Control shows only iChar characters. If the last shown character is decimal separator - show only first N-1 characters. So "144.5" is shown like "144" and not like "144.".
-		if (sValue.length >= iChar && (sValue[iChar - 1] === "." || sValue[iChar - 1] === ",")) {
-			oRm.text(sValue.substring(0, iChar - 1));
+			oRm.close("div");
+			oRm.close("div");
+			oRm.close("div");
 		} else {
-			oRm.text(sValue ? sValue.substring(0, iChar) : sEmptyValue);
-		}
+			var oMaxDigitsData = oControl._getMaxDigitsData();
+			this._prepareAndRenderIcon(oRm, oControl, oControl._oIcon, oMaxDigitsData.fontClass);
 
-		oRm.close("span");
+			var iChar = oControl.getTruncateValueTo() || oMaxDigitsData.maxLength;
+			oRm.openStart("span" , oControl.getId() + "-value-inner");
+			if (oMaxDigitsData.fontClass) {
+				oRm.class(oMaxDigitsData.fontClass);
+			}
+			oRm.openEnd();
 
-		this._renderScaleAndIndicator(oRm, oControl, sWithoutMargin, sValue, sScale, oMaxDigitsData.fontClass);
+			//Control shows only iChar characters. If the last shown character is decimal separator - show only first N-1 characters. So "144.5" is shown like "144" and not like "144.".
+			if (sValue.length >= iChar && (sValue[iChar - 1] === "." || sValue[iChar - 1] === ",")) {
+				oRm.text(sValue.substring(0, iChar - 1));
+			} else {
+				oRm.text(sValue ? sValue.substring(0, iChar) : sEmptyValue);
+			}
 
-		oRm.close("div");
+			oRm.close("span");
+
+			this._renderScaleAndIndicator(oRm, oControl, sWithoutMargin, sValue, sScale, oMaxDigitsData.fontClass);
+
+			oRm.close("div");
+		}
 	};
 
 	return NumericContentRenderer;

package/src/sap/m/ObjectAttribute.js

@@ -13,9 +13,10 @@ sap.ui.define([
 	'sap/ui/events/KeyCodes',
 	'./ObjectAttributeRenderer',
 	'sap/base/Log',
+	'sap/ui/base/ManagedObjectObserver',
 	'sap/ui/core/Core'
 ],
-function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer, Log, Core) {
+function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer, Log, ManagedObjectObserver, Core) {
 	"use strict";
 
 	// shortcut for sap.ui.core.TextDirection
@@ -38,7 +39,7 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 	 * <code>text</code> property is styled and acts as a link. In this case the <code>text</code>
 	 * property must also be set, as otherwise there will be no link displayed for the user.
 	 * @extends sap.ui.core.Control
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public
@@ -116,13 +117,24 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 		this.setAggregation('_textControl', new Text());
 	};
 
+	ObjectAttribute.prototype.exit = function() {
+		if (this._oCustomContentObserver) {
+			this._oCustomContentObserver.disconnect();
+			this._oCustomContentObserver = null;
+		}
+
+		if (this._oCustomContentCloning) {
+			this._oCustomContentCloning.destroy();
+		}
+	};
+
 	/**
 	 * Delivers text control with updated title, text and maxLines properties.
 	 *
 	 * @private
 	 */
 	ObjectAttribute.prototype._getUpdatedTextControl = function() {
-		var oAttrAggregation = this.getAggregation('customContent') || this.getAggregation('_textControl'),
+		var oAttrAggregation = this._oCustomContentCloning || this.getAggregation('_textControl'),
 			sTitle = this.getTitle(),
 			sText = this.getAggregation('customContent') ? this.getAggregation('customContent').getText() : this.getText(),
 			sTextDir = this.getTextDirection(),
@@ -280,11 +292,40 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 	};
 
 	ObjectAttribute.prototype.setCustomContent = function(oCustomContent) {
-		if (oCustomContent && oCustomContent.isA('sap.m.Link')) {
-			oCustomContent._getTabindex = function() {
+		var oCurrentCustomContent = this.getCustomContent(),
+			fnGetTabIndex = function() {
 				return "-1";
 			};
+
+		//for the cases where the original custom content is rendered
+		if (oCustomContent && oCustomContent.isA('sap.m.Link')) {
+			oCustomContent._getTabindex = fnGetTabIndex;
+		}
+
+		// clone the new aggregation, but first destroy the previous cloning
+		if (this._oCustomContentCloning) {
+			this._oCustomContentCloning.destroy();
+		}
+		this._oCustomContentCloning = oCustomContent && oCustomContent.clone();
+
+		if (this._oCustomContentCloning && this._oCustomContentCloning.isA('sap.m.Link')) {
+			this._oCustomContentCloning._getTabindex = fnGetTabIndex;
+		}
+
+		if (!this._oCustomContentObserver) {
+			this._oCustomContentObserver = new ManagedObjectObserver(function() {
+				this.invalidate();
+			}.bind(this));
 		}
+
+		// do not listen for property changes on the old control
+		if (oCurrentCustomContent) {
+			this._oCustomContentObserver.unobserve(oCurrentCustomContent);
+		}
+
+		// listen on the new one
+		oCustomContent && this._oCustomContentObserver.observe(oCustomContent, { properties: true });
+
 		return this.setAggregation('customContent', oCustomContent);
 	};
 

package/src/sap/m/ObjectHeader.js

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * <code>sapUiResponsivePadding--header</code>.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectIdentifier.js

@@ -52,7 +52,7 @@ function(
 	 *
      * <b>Note:</b> This control should not be used with {@link sap.m.Label} or in Forms along with {@link sap.m.Label}.
 	 * @extends sap.ui.core.Control
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectListItem.js

@@ -59,7 +59,7 @@ function(
 		 *
 		 * <b>Note:</b> The control must only be used in the context of a list.
 		 * @extends sap.m.ListItemBase
-		 * @version 1.95.0
+		 * @version 1.96.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ObjectMarker.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectNumber.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectStatus.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectStatusRenderer.js

@@ -102,8 +102,11 @@ sap.ui.define(['sap/ui/core/ValueStateSupport', 'sap/ui/core/IndicationColorSupp
 				if (sTextDir) {
 					oRm.attr("dir", sTextDir.toLowerCase());
 				}
+
+				oRm.attr("data-colon", Core.getLibraryResourceBundle("sap.m").getText("LABEL_COLON"));
+
 				oRm.openEnd();
-				oRm.text(oObjStatus.getTitle() + ":");
+				oRm.text(oObjStatus.getTitle());
 				oRm.close("span");
 			}
 

package/src/sap/m/OverflowToolbar.js

@@ -131,7 +131,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.Toolbar,sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public
@@ -372,16 +372,14 @@ sap.ui.define([
 
 	OverflowToolbar.prototype._applyFocus = function () {
 		var oFocusedChildControl,
-			$FocusedChildControl,
 			$LastFocusableChildControl = this.$().lastFocusableDomRef();
 
 		if (this.sFocusedChildControlId) {
 			oFocusedChildControl = sap.ui.getCore().byId(this.sFocusedChildControlId);
-			$FocusedChildControl = oFocusedChildControl && oFocusedChildControl.$();
 		}
 
-		if ($FocusedChildControl && $FocusedChildControl.length){
-			$FocusedChildControl.trigger("focus");
+		if (oFocusedChildControl && oFocusedChildControl.getDomRef()){
+			oFocusedChildControl.focus();
 
 		} else if (this._bControlWasFocused) {
 			// If a control of the toolbar was focused, and we're here, then the focused control overflowed, so set the focus to the overflow button

package/src/sap/m/OverflowToolbarAssociativePopover.js

@@ -30,7 +30,7 @@ sap.ui.define(['./Popover', './OverflowToolbarAssociativePopoverControls', './Ov
 	 * @extends sap.m.Popover
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/OverflowToolbarButton.js

@@ -27,7 +27,7 @@ sap.ui.define(['sap/m/Button', 'sap/m/ButtonRenderer'],
 	 * @implements sap.f.IShellBar
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public
@@ -72,7 +72,9 @@ sap.ui.define(['sap/m/Button', 'sap/m/ButtonRenderer'],
 
 		OverflowToolbarButton.prototype.getOverflowToolbarConfig = function () {
 			var oConfig = {
-				canOverflow: true
+				canOverflow: true,
+				propsUnrelatedToSize: ["enabled", "type"],
+				autoCloseEvents: ["press"]
 			};
 
 			oConfig.onBeforeEnterOverflow = this._onBeforeEnterOverflow.bind(this);

package/src/sap/m/OverflowToolbarLayoutData.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/m/ToolbarLayoutData', 'sap/m/library', "sap/base/Log"],
 	 * Holds layout data for the {@link sap.m.OverflowToolbar} items.
 	 * @extends sap.m.ToolbarLayoutData
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/OverflowToolbarToggleButton.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/m/ToggleButton', 'sap/m/ToggleButtonRenderer'],
 		 * @extends sap.m.ToggleButton
 		 *
 		 * @author SAP SE
-		 * @version 1.95.0
+		 * @version 1.96.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/P13nAnyFilterItem.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>filterItems</code> aggregation in P13nFilterPanel control.
 	 * @extends sap.m.P13nFilterItem
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/m/P13nColumnsItem.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>columnsItems</code> aggregation in <code>P13nColumnsPanel</code> control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 * @constructor
 	 * @author SAP SE
 	 * @public

package/src/sap/m/P13nColumnsPanel.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class The <code>P13nColumnsPanel</code> control is used to define column-specific settings for table personalization.
 	 * @extends sap.m.P13nPanel
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 * @constructor
 	 * @public
 	 * @since 1.26.0
@@ -762,7 +762,7 @@ sap.ui.define([
 		if (iIndex < 0) {
 			return null;
 		}
-		return this._oTable.getBinding("items").getContexts()[iIndex].getObject().columnKey;
+		return this._oTable.getBinding("items").getContexts(undefined, undefined, undefined, true)[iIndex].getObject().columnKey;
 	};
 
 	P13nColumnsPanel.prototype._getModelItemIndexByColumnKey = function(sColumnKey) {
@@ -790,7 +790,7 @@ sap.ui.define([
 	};
 
 	P13nColumnsPanel.prototype._getTableItemByColumnKey = function(sColumnKey) {
-		var aContext = this._oTable.getBinding("items").getContexts();
+		var aContext = this._oTable.getBinding("items").getContexts(undefined, undefined, undefined, true);
 		var aTableItems = this._oTable.getItems().filter(function(oTableItem, iIndex) {
 			return aContext[iIndex].getObject().columnKey === sColumnKey;
 		});