@openui5/sap.m 1.91.0 → 1.93.2

package/src/sap/m/NavContainer.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -52,7 +52,9 @@ sap.ui.define([
 	 */
 	var NavContainer = Control.extend("sap.m.NavContainer", /** @lends sap.m.NavContainer.prototype */ {
 		metadata: {
-
+			interfaces: [
+				"sap.ui.core.IPlaceholderSupport"
+			],
 			library: "sap.m",
 			properties: {
 
@@ -246,6 +248,15 @@ sap.ui.define([
 		}
 	});
 
+	// Delegate registered by the NavContainer#showPlaceholder function
+	var oPlaceholderDelegate = {
+		"onAfterRendering": function() {
+			if (this._placeholder) {
+				this._placeholder.show(this);
+			}
+		}
+	};
+
 	var bUseAnimations = sap.ui.getCore().getConfiguration().getAnimation(),
 		fnGetDelay = function (iDelay) {
 			return bUseAnimations ? iDelay : 0;
@@ -281,6 +292,7 @@ sap.ui.define([
 
 	NavContainer.prototype.exit = function () {
 		this._mFocusObject = null; // allow partial garbage collection when app code leaks the NavContainer (based on a real scenario)
+		this._placeholder = undefined;
 	};
 
 
@@ -1260,7 +1272,8 @@ sap.ui.define([
 				jQuery(this).off("webkitAnimationEnd animationend");
 
 				if (!bFirstSlideDone) {
-					return (bFirstSlideDone = true);
+					bFirstSlideDone = true;
+					return bFirstSlideDone;
 				}
 
 				bTransitionEndPending = false;
@@ -1798,6 +1811,61 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+	 * 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 {sap.ui.core.Placeholder} mSettings.placeholder The placeholder instance
+	 * @public
+	 * @since 1.91
+	 */
+	NavContainer.prototype.showPlaceholder = function(mSettings) {
+		if (this._placeholder) {
+			this.hidePlaceholder();
+		}
+
+		if (mSettings.placeholder) {
+			this._placeholder = mSettings.placeholder;
+		}
+
+		if (this.getDomRef()) {
+			this._placeholder.show(this);
+		}
+		// Add an event delegate to reinsert the placeholder after it's removed after a rerendering
+		this.addEventDelegate(oPlaceholderDelegate, this);
+	};
+
+	/**
+	 * Hides the placeholder and removes the 'onAfterRendering' placeholder delegate.
+	 *
+	 * @public
+	 * @since 1.91
+	 */
+	NavContainer.prototype.hidePlaceholder = function() {
+		if (this._placeholder) {
+			this._placeholder.hide();
+
+			// remove the delegate because the placeholder is hidden
+			this.removeEventDelegate(oPlaceholderDelegate);
+		}
+	};
+
+	/**
+	 * Checks whether a placeholder is needed by comparing the currently displayed page with
+	 * the page object that is going to be displayed. If they are the same, no placeholder needs
+	 * to be shown.
+	 *
+	 * @param {string} sAggregationName The aggregation name
+	 * @param {object} oObject The page object to be displayed
+	 * @returns {boolean} Whether a placeholder is needed or not
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.core.routing
+	 */
+	NavContainer.prototype.needPlaceholder = function(sAggregationName, oObject) {
+		return this.getCurrentPage() !== oObject;
+	};
 
 	/**
 	 * Fiori 2.0 Adaptation
@@ -1841,51 +1909,63 @@ sap.ui.define([
 
 	/**
 	 * This event is fired before the NavContainer shows this child control for the first time.
+	 *
+	 * @name sap.m.NavContainerChild#beforeFirstShow
 	 * @event
+	 * @param {sap.ui.base.Event} oControlEvent
+	 * @param {sap.ui.base.EventProvider} oControlEvent.getSource
+	 * @param {object} oControlEvent.getParameters
+	 * @param {jQuery.Event} oEvent The event object
 	 * @param {sap.ui.core.Control} oEvent.srcControl the NavContainer firing the event
 	 * @param {object} oEvent.data the data object which has been passed with the "to" navigation, or an empty object
 	 * @param {object} oEvent.backData the data object which has been passed with the back navigation, or an empty object
-	 * @name sap.m.NavContainerChild.prototype.BeforeFirstShow
 	 * @public
 	 */
 
 	/**
 	 * This event is fired every time before the NavContainer shows this child control. In case of animated transitions this
 	 * event is fired before the transition starts.
+	 *
+	 * @name sap.m.NavContainerChild#beforeShow
 	 * @event
+	 * @param {sap.ui.base.Event} oControlEvent
+	 * @param {sap.ui.base.EventProvider} oControlEvent.getSource
+	 * @param {object} oControlEvent.getParameters
+	 * @param {jQuery.Event} oEvent The event object
 	 * @param {sap.ui.core.Control} oEvent.srcControl the NavContainer firing the event
 	 * @param {object} oEvent.data the data object which has been passed with the "to" navigation, or an empty object
 	 * @param {object} oEvent.backData the data object which has been passed with the back navigation, or an empty object
-	 * @name sap.m.NavContainerChild.prototype.BeforeShow
 	 * @public
 	 */
 
 	/**
 	 * This event is fired every time when the NavContainer has made this child control visible. In case of animated transitions this
 	 * event is fired after the transition finishes. This control is now being displayed and not animated anymore.
+	 *
+	 * @name sap.m.NavContainerChild#afterShow
 	 * @event
+	 * @param {sap.ui.base.Event} oControlEvent
+	 * @param {sap.ui.base.EventProvider} oControlEvent.getSource
+	 * @param {object} oControlEvent.getParameters
+	 * @param {jQuery.Event} oEvent The event object
 	 * @param {sap.ui.core.Control} oEvent.srcControl the NavContainer firing the event
 	 * @param {object} oEvent.data the data object which has been passed with the "to" navigation, or an empty object
 	 * @param {object} oEvent.backData the data object which has been passed with the back navigation, or an empty object
-	 * @name sap.m.NavContainerChild.prototype.AfterShow
 	 * @public
 	 */
 
-	/**
-	 * This event is fired every time before the NavContainer hides this child control. In case of animated transitions this
-	 * event is fired before the transition starts.
-	 * @event
-	 * @param {sap.ui.core.Control} oEvent.srcControl the NavContainer firing the event
-	 * @name sap.m.NavContainerChild.prototype.BeforeHide
-	 * @public
-	 */
 
 	/**
 	 * This event is fired every time when the NavContainer has made this child control invisible. In case of animated transitions this
 	 * event is fired after the transition finishes. This control is now no longer being displayed and not animated anymore.
+	 *
+	 * @name sap.m.NavContainerChild#beforeHide
 	 * @event
+	 * @param {sap.ui.base.Event} oControlEvent
+	 * @param {sap.ui.base.EventProvider} oControlEvent.getSource
+	 * @param {object} oControlEvent.getParameters
+	 * @param {jQuery.Event} oEvent The event object
 	 * @param {sap.ui.core.Control} oEvent.srcControl the NavContainer firing the event
-	 * @name sap.m.NavContainerChild.prototype.AfterHide
 	 * @public
 	 */
 

package/src/sap/m/NewsContent.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/NotificationList.js

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

package/src/sap/m/NotificationListBase.js

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

package/src/sap/m/NotificationListGroup.js

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

package/src/sap/m/NotificationListItem.js

@@ -66,7 +66,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @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.91.0
+	 * @version 1.93.2
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/ObjectAttribute.js

@@ -38,7 +38,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.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectHeader.js

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

package/src/sap/m/ObjectHeaderRenderer.js

@@ -699,13 +699,16 @@ sap.ui.define([
 			oRM.attr("title", sTooltip);
 		}
 		// ARIA attributes
-		oRM.accessibilityState({
-			role : "region",
-			labelledby: {
-				value: oOH.getId() + "-titleText-inner",
-				append: true
-			}
-		});
+		oRM.accessibilityState({ role : "region" });
+
+		if (oOH.getTitle()) {
+			oRM.accessibilityState({
+				labelledby: {
+					value: oOH.getId() + "-titleText-inner",
+					append: true
+				}
+			});
+		}
 
 		oRM.openEnd();
 

package/src/sap/m/ObjectIdentifier.js

@@ -15,7 +15,8 @@ sap.ui.define([
 	'sap/ui/core/library',
 	'sap/ui/Device',
 	'sap/ui/base/ManagedObject',
-	'./ObjectIdentifierRenderer'
+	'./ObjectIdentifierRenderer',
+	"sap/ui/events/KeyCodes"
 ],
 function(
 	library,
@@ -27,7 +28,8 @@ function(
 	coreLibrary,
 	Device,
 	ManagedObject,
-	ObjectIdentifierRenderer
+	ObjectIdentifierRenderer,
+	KeyCodes
 	) {
 	"use strict";
 
@@ -50,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.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -399,8 +401,10 @@ function(
 	 * @param {jQuery.Event} oEvent The fired event
 	 * @private
 	 */
-	ObjectIdentifier.prototype.onsapspace = function(oEvent) {
-		ObjectIdentifier.prototype._handlePress.apply(this, arguments);
+	ObjectIdentifier.prototype.onkeyup = function(oEvent) {
+		if (oEvent && oEvent.which === KeyCodes.SPACE) {
+			ObjectIdentifier.prototype._handlePress.apply(this, arguments);
+		}
 	};
 
 	/**
@@ -441,7 +445,7 @@ function(
 
 	/**
 	 * @see sap.ui.core.Control#getAccessibilityInfo
-	 * @returns {Object} Current accessibility state of the control
+	 * @returns {object} Current accessibility state of the control
 	 * @protected
 	 */
 	ObjectIdentifier.prototype.getAccessibilityInfo = function() {

package/src/sap/m/ObjectIdentifierRenderer.js

@@ -108,7 +108,7 @@ sap.ui.define(['./library', 'sap/ui/core/Core'],
 			oRm.openStart("div", oOI.getId() + "-text"); // Text begins
 			oRm.class("sapMObjectIdentifierText");
 
-			if (!!oOI.getProperty("text") && !!oOI.getProperty("title")) {
+			if (oOI.getProperty("text") && oOI.getProperty("title")) {
 				oRm.class("sapMObjectIdentifierTextBellow");
 			}
 			oRm.openEnd();

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.91.0
+		 * @version 1.93.2
 		 *
 		 * @constructor
 		 * @public
@@ -416,7 +416,7 @@ function(
 		ObjectListItem.prototype._activeHandlingInheritor = function() {
 			var sActiveSrc = this.getActiveIcon();
 
-			if (!!this._oImageControl  && !!sActiveSrc) {
+			if (this._oImageControl && sActiveSrc) {
 				this._oImageControl.setSrc(sActiveSrc);
 			}
 		};
@@ -428,7 +428,7 @@ function(
 		 */
 		ObjectListItem.prototype._inactiveHandlingInheritor = function() {
 			var sSrc = this.getIcon();
-			if (!!this._oImageControl) {
+			if (this._oImageControl) {
 				this._oImageControl.setSrc(sSrc);
 			}
 		};

package/src/sap/m/ObjectListItemRenderer.js

@@ -132,7 +132,7 @@ sap.ui.define(['./ListItemBaseRenderer', 'sap/ui/core/Renderer', 'sap/ui/core/li
 
 			rm.openEnd();
 
-			if (!!oLI.getIcon()) {
+			if (oLI.getIcon()) {
 				rm.openStart("div");
 				rm.class("sapMObjLIconDiv");
 
@@ -174,7 +174,7 @@ sap.ui.define(['./ListItemBaseRenderer', 'sap/ui/core/Renderer', 'sap/ui/core/li
 			rm.close("div"); // End Top row container
 
 			rm.openStart("div");
-			rm.style("clear", "both;");
+			rm.style("clear", "both");
 			rm.openEnd();
 			rm.close("div");
 

package/src/sap/m/ObjectMarker.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -145,13 +145,6 @@ sap.ui.define([
 		}
 	});
 
-	/**
-	 * Library internationalization resource bundle.
-	 *
-	 * @type {module:sap/base/i18n/ResourceBundle}
-	 */
-	var oRB = sap.ui.getCore().getLibraryResourceBundle("sap.m");
-
 	/**
 	 * Map of predefined <code>ObjectMarker</code> types.
 	 *
@@ -167,7 +160,7 @@ sap.ui.define([
 				}
 			},
 			text: {
-				value: oRB.getText("OM_FLAG"),
+				value: "OM_FLAG",
 				visibility: {
 					small: false,
 					large: false
@@ -183,7 +176,7 @@ sap.ui.define([
 				}
 			},
 			text: {
-				value: oRB.getText("OM_FAVORITE"),
+				value: "OM_FAVORITE",
 				visibility: {
 					small: false,
 					large: false
@@ -199,7 +192,7 @@ sap.ui.define([
 				}
 			},
 			text: {
-				value: oRB.getText("OM_DRAFT"),
+				value: "OM_DRAFT",
 				visibility: {
 					small: true,
 					large: true
@@ -215,7 +208,7 @@ sap.ui.define([
 				}
 			},
 			text: {
-				value: oRB.getText("OM_LOCKED"),
+				value: "OM_LOCKED",
 				visibility: {
 					small: false,
 					large: true
@@ -231,7 +224,7 @@ sap.ui.define([
 				}
 			},
 			text: {
-				value: oRB.getText("OM_UNSAVED"),
+				value: "OM_UNSAVED",
 				visibility: {
 					small: false,
 					large: true
@@ -247,7 +240,7 @@ sap.ui.define([
 				}
 			},
 			text: {
-				value: oRB.getText("OM_LOCKED_BY"),
+				value: "OM_LOCKED_BY",
 				visibility: {
 					small: false,
 					large: true
@@ -263,7 +256,7 @@ sap.ui.define([
 				}
 			},
 			text: {
-				value: oRB.getText("OM_UNSAVED_BY"),
+				value: "OM_UNSAVED_BY",
 				visibility: {
 					small: false,
 					large: true
@@ -390,6 +383,7 @@ sap.ui.define([
 
 		var oType = ObjectMarker.M_PREDEFINED_TYPES[this.getType()],
 			oInnerControl = this._getInnerControl(),
+			oInnerIcon = oInnerControl && oInnerControl._getIconAggregation(),
 			sAdditionalInfo = this.getAdditionalInfo(),
 			bIsIconVisible = this._isIconVisible(),
 			bIsTextVisible = this._isTextVisible(),
@@ -408,7 +402,9 @@ sap.ui.define([
 
 		if (bIsIconVisible) {
 			oInnerControl.setIcon(oType.icon.src, bSuppressInvalidate);
-			oInnerControl._getIconAggregation().setDecorative(!bIsIconOnly); // icon should be decorative if we have text
+			oInnerIcon.setDecorative(!bIsIconOnly); // icon should be decorative if we have text
+			oInnerIcon.setAlt(sText);
+			oInnerIcon.setUseIconTooltip(false);
 			this.addStyleClass("sapMObjectMarkerIcon");
 		} else {
 			oInnerControl.setIcon(null, bSuppressInvalidate);
@@ -420,7 +416,7 @@ sap.ui.define([
 			oInnerControl.setText(sText, bSuppressInvalidate);
 			this.addStyleClass("sapMObjectMarkerText");
 		} else {
-			if (oInnerControl.getIcon()) {
+			if (oInnerIcon) {
 				oInnerControl.setAggregation("tooltip", sText, bSuppressInvalidate);
 			}
 			oInnerControl.setText(null, bSuppressInvalidate);
@@ -451,6 +447,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ObjectMarker.prototype._getMarkerText = function (oType, sType, sAdditionalInfo) {
+		var oRB = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
 		switch (sType) {
 			case "LockedBy":
@@ -458,10 +455,11 @@ sap.ui.define([
 			case "UnsavedBy":
 				return (sAdditionalInfo === "") ? oRB.getText('OM_UNSAVED_BY_ANOTHER_USER') : oRB.getText('OM_UNSAVED_BY', [sAdditionalInfo]);
 			default:
-				return (sAdditionalInfo === "") ? oType.text.value : oType.text.value + " " + sAdditionalInfo;
+				return (sAdditionalInfo === "") ? oRB.getText(oType.text.value) : oRB.getText(oType.text.value) + " " + sAdditionalInfo;
 		}
 	};
 
+
 	/**
 	 * Determines if the icon of the control should be visible or not.
 	 *

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.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -156,7 +156,7 @@ sap.ui.define([
 
 	/**
 	 * @see sap.ui.core.Control#getAccessibilityInfo
-	 * @returns {Object} Current accessibility state of the control
+	 * @returns {object} Current accessibility state of the control
 	 * @protected
 	 */
 	ObjectNumber.prototype.getAccessibilityInfo = function() {

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.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -137,29 +137,22 @@ sap.ui.define([
 	}});
 
 	/**
-	 * Creates a new sap.ui.core.InvisibleText control instance with a text property value compliant
-	 * to the sap.m.ObjectStatus control instance state and attaches its DOM representation
-	 * to the static area.
+	 * Returns a text compliant to the sap.m.ObjectStatus control instance state
 	 *
 	 * @private
 	 * @param {string} sState the propety state value.
+	 * @returns {string} The text compliant to the control state
 	 */
-	ObjectStatus.prototype._createInvisibleTextReferece = function(sState) {
+	ObjectStatus.prototype._getStateText = function(sState) {
 		var sStateText;
 
 		if (sState !== ValueState.None) {
 			sStateText = ValueStateSupport.getAdditionalText(sState) ?
 				ValueStateSupport.getAdditionalText(sState) :
 				IndicationColorSupport.getAdditionalText(sState);
-
-			if (this._oInvisibleText) {
-				this._oInvisibleText.setText(sStateText);
-			} else {
-				this._oInvisibleText = new InvisibleText({
-					text: sStateText
-				}).toStatic();
-			}
 		}
+
+		return sStateText;
 	};
 
 	/**
@@ -172,11 +165,6 @@ sap.ui.define([
 			this._oImageControl.destroy();
 			this._oImageControl = null;
 		}
-
-		if (this._oInvisibleText){
-			this._oInvisibleText.destroy();
-			this._oInvisibleText = null;
-		}
 	};
 
 	/**
@@ -218,7 +206,6 @@ sap.ui.define([
 			throw new Error('"' + sValue + '" is not a value of the enums sap.ui.core.ValueState or sap.ui.core.IndicationColor for property "state" of ' + this);
 		}
 
-		this._createInvisibleTextReferece(sValue);
 		return this.setProperty("state", sValue);
 	};
 
@@ -288,24 +275,26 @@ sap.ui.define([
 	/**
 	 * @see sap.ui.core.Control#getAccessibilityInfo
 	 *
-	 * @returns {Object} Current accessibility state of the control
+	 * @returns {object} Current accessibility state of the control
 	 * @protected
 	 */
 	ObjectStatus.prototype.getAccessibilityInfo = function() {
-		var sState = ValueStateSupport.getAdditionalText(this.getState());
+		var sState = ValueStateSupport.getAdditionalText(this.getState()),
+			sDescription;
 
 		if (this.getState() != ValueState.None) {
 			sState = (sState !== null) ? sState : IndicationColorSupport.getAdditionalText(this.getState());
 		}
 
+		sDescription = (
+			(this.getTitle() || "") + " " +
+			(this.getText() || "") + " " +
+			(sState !== null ? sState : "") + " " +
+			(this.getTooltip() || "")
+		).trim();
+
 		return {
-			description: (
-				(this.getTitle() || "") + " " +
-				(this.getText() || "") + " " +
-				(sState !== null ? sState : "") + " " +
-				(this.getTooltip() || "") + " " +
-				sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("OBJECT_STATUS")
-			).trim()
+			description: sDescription + (sDescription ? " " + sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("OBJECT_STATUS") : "")
 		};
 	};