@openui5/sap.m 1.96.5 → 1.99.0

package/src/sap/m/MultiInput.js

@@ -121,7 +121,7 @@ function(
 	* @implements sap.ui.core.ISemanticFormContent
 	*
 	* @author SAP SE
-	* @version 1.96.5
+	* @version 1.99.0
 	*
 	* @constructor
 	* @public
@@ -336,16 +336,21 @@ function(
 					oTokenizer.removeStyleClass("sapMTokenizerIndicatorDisabled");
 				}
 				this._syncInputWidth(oTokenizer);
-				this._handleInnerVisibility();
-				this._handleNMoreAccessibility();
-				this._registerTokenizerResizeHandler();
+
+				// Prevent layout thrashing from the methods below as the Tokenizer
+				// does not need any adjustments without tokens
+				if (this.getTokens().length) {
+					this._handleInnerVisibility();
+					this._handleNMoreAccessibility();
+					this._registerTokenizerResizeHandler();
+				}
 			}.bind(this)
 		}, this);
 		this._aTokenValidators = [];
 
 		this.setShowValueHelp(true);
 		this.setShowSuggestion(true);
-		this._getSuggestionsPopoverInstance()._oPopover
+		this._getSuggestionsPopover().getPopover()
 			.attachBeforeOpen(function () {
 				if (that.isMobileDevice() !== true) {
 					return;
@@ -356,6 +361,11 @@ function(
 				this.addContent(oTokensList);
 
 				that._manageListsVisibility(!!oTokenizer.getTokens().length);
+			})
+			.attachAfterOpen(function () {
+				var sNavigationText = that.getTokens().length ? oRb.getText("MULTIINPUT_NAVIGATION_POPUP_AND_TOKENS") : oRb.getText("MULTIINPUT_NAVIGATION_POPUP");
+
+				that._oInvisibleMessage.announce(sNavigationText);
 			});
 
 		this.attachSuggestionItemSelected(this._onSuggestionItemSelected, this);
@@ -598,7 +608,7 @@ function(
 				oScroll.scrollTo(0, 0, 0);
 			}
 
-			this._getSuggestionsPopoverInstance().getInput().focus();
+			this._getSuggestionsPopover().getInput().focus();
 		}
 		this._bTokenIsAdded = false;
 	};
@@ -902,7 +912,7 @@ function(
 	 */
 	MultiInput.prototype._validationCallback = function (iOldLength, bValidated) {
 		var iNewLength = this.getAggregation("tokenizer").getTokens().length;
-		var oSuggestionsPopover = this._getSuggestionsPopoverInstance();
+		var oSuggestionsPopover = this._getSuggestionsPopover();
 
 		this._bIsValidating = false;
 		if (bValidated) {
@@ -975,6 +985,7 @@ function(
 	 * @param {jQuery.Event} oEvent The event object
 	 */
 	MultiInput.prototype.onsapenter = function (oEvent) {
+		var sDOMValue = this.getDOMValue();
 		Input.prototype.onsapenter.apply(this, arguments);
 
 		var bValidateFreeText = true,
@@ -992,7 +1003,7 @@ function(
 			this._validateCurrentText();
 		}
 
-		if (oEvent && oEvent.setMarked && (this._bTokenIsValidated || this.getDOMValue())) {
+		if (oEvent && oEvent.setMarked && (this._bTokenIsValidated || sDOMValue)) {
 			oEvent.setMarked();
 		}
 
@@ -1146,7 +1157,7 @@ function(
 	 * @private
 	 */
 	MultiInput.prototype._getIsSuggestionPopupOpen = function () {
-		var oSuggestionsPopover = this._getSuggestionsPopoverInstance(),
+		var oSuggestionsPopover = this._getSuggestionsPopover(),
 			oSuggestionsPopoverPopup = this._getSuggestionsPopoverPopup();
 
 		return oSuggestionsPopover && oSuggestionsPopoverPopup && oSuggestionsPopoverPopup.isOpen();
@@ -1347,7 +1358,7 @@ function(
 	 */
 	MultiInput.prototype.updateInputField = function(sNewValue) {
 		Input.prototype.updateInputField.call(this, sNewValue);
-		var oSuggestionsPopover = this._getSuggestionsPopoverInstance();
+		var oSuggestionsPopover = this._getSuggestionsPopover();
 
 		this.setDOMValue('');
 
@@ -1443,27 +1454,19 @@ function(
 	 */
 	MultiInput.prototype._decoratePopupInput = function (oPopupInput) {
 		Input.prototype._decoratePopupInput.apply(this, arguments);
-		var that = this;
 
 		if (!oPopupInput) {
 			return;
 		}
 
-		oPopupInput.addEventDelegate({
-			oninput: that._manageListsVisibility.bind(that, false),
-			onsapenter: function (oEvent) {
-				if (oPopupInput.getValue()) {
-					that._closeSuggestionPopup();
-				}
-
-				that._validateCurrentText();
-				that._setValueVisible(false);
-
-				// Fire through the MultiInput Popup's input value and save it
-				that.onChange(oEvent, null, oPopupInput.getValue());
-			}
-		});
+		if (!this._oPopupInputDelegate) {
+			this._oPopupInputDelegate = {
+				oninput: this._manageListsVisibility.bind(this, false),
+				onsapenter: this._handleConfirmation.bind(this, false)
+			};
+		}
 
+		oPopupInput.addEventDelegate(this._oPopupInputDelegate, this);
 		return oPopupInput;
 	};
 
@@ -1473,12 +1476,32 @@ function(
 
 
 	MultiInput.prototype.forwardEventHandlersToSuggPopover = function (oSuggPopover) {
-
-		Input.prototype.forwardEventHandlersToSuggPopover.apply(this, arguments);
 		oSuggPopover.setShowSelectedPressHandler(this._handleShowSelectedPress.bind(this));
+		oSuggPopover.setOkPressHandler(this._handleConfirmation.bind(this, true));
+		oSuggPopover.setCancelPressHandler(this._handleCancelPress.bind(this));
 	};
 
-	MultiInput.prototype._handleShowSelectedPress  = function (oEvent) {
+	// Handles "Enter" key press and OK button press
+	MultiInput.prototype._handleConfirmation = function (bOkButtonPressed, oEvent) {
+		var oPopupInput = this._getSuggestionsPopover().getInput();
+
+		if (bOkButtonPressed || (!bOkButtonPressed && oPopupInput.getValue())) {
+			this._closeSuggestionPopup();
+		}
+
+		this._validateCurrentText();
+		this._setValueVisible(false);
+
+		// Fire through the MultiInput Popup's input value and save it
+		this.onChange(oEvent, null, oPopupInput.getValue());
+	};
+
+	MultiInput.prototype._handleCancelPress  = function (oEvent) {
+		this._getSuggestionsPopover().getInput().setDOMValue(this.getLastValue());
+		this._closeSuggestionPopup();
+	};
+
+	MultiInput.prototype._handleShowSelectedPress = function (oEvent) {
 		this._bShowListWithTokens = oEvent.getSource().getPressed();
 		this._manageListsVisibility(this._bShowListWithTokens);
 	};
@@ -1566,21 +1589,11 @@ function(
 	 * @private
 	 */
 	MultiInput.prototype._getSuggestionsList = function() {
-		var oSuggestionsPopover = this._getSuggestionsPopoverInstance();
+		var oSuggestionsPopover = this._getSuggestionsPopover();
 
 		return oSuggestionsPopover && oSuggestionsPopover.getItemsContainer();
 	};
 
-	/**
-	 * Returns the <code>SuggestionsPopover</code> instance.
-	 *
-	 * @returns {sap.m.SuggestionsPopover} A suggestion popover instance.
-	 * @private
-	 */
-	MultiInput.prototype._getSuggestionsPopoverInstance = function () {
-		return this._oSuggPopover;
-	};
-
 	/**
 	 * Returns the <code>sap.m.Popover</code> instance, it can be empty and not visible (rendered)
 	 * if for example the <code>showSuggestions</code> property is set to false or it is true but no suggestion items
@@ -1643,7 +1656,7 @@ function(
 	 * Function calculates the available space for the tokenizer
 	 *
 	 * @private
-	 * @return {String | null} CSSSize in px
+	 * @return {string | null} CSSSize in px
 	 */
 	MultiInput.prototype._calculateSpaceForTokenizer = function () {
 		var oDomRef = this.getDomRef();

package/src/sap/m/NavContainer.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NavContainerRenderer.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/ui/core/InvisibleRenderer"],
 	 * 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} oControl The control that should be rendered
+	 * @param {sap.m.NavContainer} oControl The control that should be rendered
 	 */
 	NavContainerRenderer.render = function(oRm, oControl) {
 

package/src/sap/m/NewsContent.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @since 1.34
 	 *
 	 * @public
@@ -130,7 +130,7 @@ sap.ui.define([
 	/**
 	 * Returns the AltText
 	 *
-	 * @returns {String} The AltText text
+	 * @returns {string} The AltText text
 	 */
 	NewsContent.prototype.getAltText = function() {
 		var sAltText = "";

package/src/sap/m/NotificationList.js

@@ -27,7 +27,7 @@ function(
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.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.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/NotificationListGroup.js

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

package/src/sap/m/NotificationListGroupRenderer.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/InvisibleRenderer", "sap/ui/D
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} rm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} control An object representation of the control that should be rendered
+	 * @param {sap.m.NotificationListGroup} control An object representation of the control that should be rendered
 	 */
 	NotificationListGroupRenderer.render = function (rm, control) {
 
@@ -33,6 +33,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/InvisibleRenderer", "sap/ui/D
 		}
 
 		if (!control.getItems().length && !control.getShowEmptyGroup()) {
+			InvisibleRenderer.render(rm, control, control.TagName);
 			return false;
 		}
 

package/src/sap/m/NotificationListItem.js

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

package/src/sap/m/NotificationListItemRenderer.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/InvisibleRenderer"], function
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} rm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} control An object representation of the control that should be rendered
+	 * @param {sap.m.NotificationListItem} control An object representation of the control that should be rendered
 	 */
 	NotificationListItemRenderer.render = function (rm, control) {
 

package/src/sap/m/NotificationListRenderer.js

@@ -21,8 +21,8 @@ sap.ui.define(['sap/ui/core/Renderer',
 		/**
 		 * Returns the ARIA accessibility role.
 		 *
-		 * @param {sap.ui.core.Control} oControl An object representation of the control
-		 * @returns {String}
+		 * @param {sap.m.NotificationList} oControl An object representation of the control
+		 * @returns {string}
 		 */
 		NotificationListRenderer.getAriaRole = function(oControl) {
 			return "list";

package/src/sap/m/NumericContent.js

@@ -107,7 +107,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @since 1.34
 	 *
 	 * @public
@@ -344,7 +344,7 @@ sap.ui.define([
 	/**
 	 * Returns the AltText
 	 *
-	 * @returns {String} The alternative text
+	 * @returns {string} The alternative text
 	 */
 	NumericContent.prototype.getAltText = function () {
 		var sValue = this.getValue();

package/src/sap/m/NumericContentRenderer.js

@@ -27,7 +27,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} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.NumericContent} oControl an object representation of the control that should be rendered
 	 */
 	NumericContentRenderer.render = function(oRm, oControl) {
 		var sState = oControl.getState();
@@ -76,9 +76,9 @@ sap.ui.define([
 	 * in comparison to Chrome.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm 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
+	 * @param {sap.m.NumericContent} oControl an object representation of the control that should be rendered
 	 * @param {sap.ui.core.Icon} oIcon the icon inside the control
-	 * @param {String} sNumericContentFontClass font class of related NumericContent
+	 * @param {string} sNumericContentFontClass font class of related NumericContent
 	 * @private
 	 */
 	NumericContentRenderer._prepareAndRenderIcon = function (oRm, oControl, oIcon, sNumericContentFontClass) {
@@ -116,11 +116,11 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @param {sap.ui.core.RenderManager} oRm 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 whose title should be rendered
-	 * @param {String} sWithoutMargin
-	 * @param {String} sValue
-	 * @param {String} sScale
-	 * @param {String} sNumericContentFontClass font class of related NumericContent
+	 * @param {sap.m.NumericContent} oControl an object representation of the control whose title should be rendered
+	 * @param {string} sWithoutMargin
+	 * @param {string} sValue
+	 * @param {string} sScale
+	 * @param {string} sNumericContentFontClass font class of related NumericContent
 	 */
 	NumericContentRenderer._renderScaleAndIndicator = function(oRm, oControl, sWithoutMargin, sValue, sScale, sNumericContentFontClass) {
 		var bIndicator = DeviationIndicator.None !== oControl.getIndicator() && sValue !== "";
@@ -161,8 +161,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @param {sap.ui.core.RenderManager} oRm 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 whose title should be rendered
-	 * @param {String} sWithoutMargin
+	 * @param {sap.m.NumericContent} oControl an object representation of the control whose title should be rendered
+	 * @param {string} sWithoutMargin
 	 */
 	NumericContentRenderer._renderValue = function(oRm, oControl, sWithoutMargin) {
 		var sValue = oControl.getValue();

package/src/sap/m/NumericInput.js

@@ -38,7 +38,7 @@ function(
 	 * @extends sap.m.Input
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/NumericInputRenderer.js

@@ -54,6 +54,7 @@ sap.ui.define(["sap/ui/core/Renderer", "./InputRenderer", "sap/ui/Device", "sap/
 			fMax,
 			fNow,
 			sDescription,
+			sDescriptionLabel,
 			aAriaLabelledByRefs,
 			aReferencingLabels,
 			sDescribedBy,
@@ -84,7 +85,10 @@ sap.ui.define(["sap/ui/core/Renderer", "./InputRenderer", "sap/ui/Device", "sap/
 
 		if (sDescription) {
 			// If there is a description, we should add a reference to it in the aria-labelledby
-			aAriaLabelledByRefs.push(oStepInput._getInput().getId() + "-descr");
+			sDescriptionLabel = oStepInput._getInput().getId() + "-descr";
+			if (aAriaLabelledByRefs.indexOf(sDescriptionLabel) === -1) {
+				aAriaLabelledByRefs.push(sDescriptionLabel);
+			}
 		}
 
 		sResultingLabelledBy = aReferencingLabels.concat(aAriaLabelledByRefs).join(" ");

package/src/sap/m/ObjectAttribute.js

@@ -25,6 +25,9 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 	// shortcut for sap.m.EmptyIndicator
 	var EmptyIndicatorMode = library.EmptyIndicatorMode;
 
+	// shortcut for sap.ui.core.aria.HasPopup
+	var AriaHasPopup = coreLibrary.aria.HasPopup;
+
 	/**
 	 * Constructor for a new <code>ObjectAttribute</code>.
 	 *
@@ -39,7 +42,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.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public
@@ -75,7 +78,21 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 			 * Determines the direction of the text.
 			 * Available options for the text direction are LTR (left-to-right), RTL (right-to-left), or Inherit. By default the control inherits the text direction from its parent control.
 			 */
-			textDirection : {type : "sap.ui.core.TextDirection", group : "Appearance", defaultValue : TextDirection.Inherit}
+			textDirection : {type : "sap.ui.core.TextDirection", group : "Appearance", defaultValue : TextDirection.Inherit},
+
+			/**
+			 * Specifies the value of the <code>aria-haspopup</code> attribute
+			 *
+			 * If the value is <code>None</code>, the attribute will not be rendered. Otherwise it will be rendered with the selected value.
+			 *
+			 * NOTE: Use this property only when an <code>sap.m.ObjectAttribute</code> instance is active and related to a popover/popup.
+			 * The value needs to be equal to the main/root role of the popup - e.g. dialog,
+			 * menu or list (examples: if you have dialog -> dialog, if you have menu -> menu; if you have list -> list; if you have dialog containing a list -> dialog).
+			 * Do not use it, if you open a standard sap.m.Dialog, MessageBox or other type of modal dialogs.
+			 *
+			 * @since 1.97.0
+			 */
+			 ariaHasPopup : {type : "sap.ui.core.aria.HasPopup", group : "Accessibility", defaultValue : AriaHasPopup.None}
 		},
 		aggregations : {
 
@@ -292,15 +309,7 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 	};
 
 	ObjectAttribute.prototype.setCustomContent = function(oCustomContent) {
-		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;
-		}
+		var oCurrentCustomContent = this.getCustomContent();
 
 		// clone the new aggregation, but first destroy the previous cloning
 		if (this._oCustomContentCloning) {
@@ -308,10 +317,6 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 		}
 		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();

package/src/sap/m/ObjectAttributeRenderer.js

@@ -11,7 +11,8 @@ sap.ui.define(["sap/ui/core/library"],
 	// shortcut for sap.ui.core.TextDirection
 	var TextDirection = coreLibrary.TextDirection;
 
-
+	// shortcut for sap.ui.core.aria.HasPopup
+	var AriaHasPopup = coreLibrary.aria.HasPopup;
 	/**
 	 * ObjectAttribute renderer.
 	 * @namespace
@@ -27,7 +28,7 @@ sap.ui.define(["sap/ui/core/library"],
 	 * 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} oOA An object representation of the control that should be rendered
+	 * @param {sap.m.ObjectAttribute} oOA An object representation of the control that should be rendered
 	 */
 	ObjectAttributeRenderer.render = function(oRm, oOA) {
 		var oParent = oOA.getParent(),
@@ -50,13 +51,9 @@ sap.ui.define(["sap/ui/core/library"],
 		}
 
 		// add tabindex, "active" class and ARIA only when the ObjectAttribute is clickable
-		// e.g. when is active ot the CustomContent is sap.m.Link
+		// e.g. when is active or the CustomContent is sap.m.Link
 		if (oOA._isClickable()) {
 			oRm.class("sapMObjectAttributeActive");
-			oRm.attr("tabindex", "0");
-			oRm.accessibilityState(oOA, {
-				role: "link"
-			});
 			if (!oOA.getTitle() && oOA.getText()) {
 			// in case of title only or text only, allow 100% of width to be taken
 				oRm.class("sapMObjectAttributeTextOnly");
@@ -124,10 +121,20 @@ sap.ui.define(["sap/ui/core/library"],
 
 	ObjectAttributeRenderer.renderActiveText = function (oRm, oOA, oParent) {
 		var oAttrAggregation = oOA.getAggregation("customContent"),
-			bRenderBDI = oOA.getTextDirection() === TextDirection.Inherit;
+			bRenderBDI = oOA.getTextDirection() === TextDirection.Inherit,
+			sAriaHasPopup = (oOA.getAriaHasPopup() === AriaHasPopup.None) ? "" : oOA.getAriaHasPopup().toLowerCase();
 
 		oRm.openStart("span", oOA.getId() + "-text");
 		oRm.class("sapMObjectAttributeText");
+		if (oAttrAggregation && oAttrAggregation.isA("sap.m.Link")) {
+			oAttrAggregation.setAriaHasPopup(oOA.getAriaHasPopup());
+		} else {
+			oRm.attr("tabindex", "0");
+			oRm.attr("role", "link");
+			if (sAriaHasPopup) {
+				oRm.attr("aria-haspopup", sAriaHasPopup);
+			}
+		}
 		oRm.openEnd();
 
 		if (oAttrAggregation && oParent) {

package/src/sap/m/ObjectHeader.js

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

package/src/sap/m/ObjectHeaderRenderer.js

@@ -79,7 +79,7 @@ sap.ui.define([
 	/**
 	 * A row is considered empty if both input parameters are empty.
 	 *
-	 * @param {sap.ui.core.Control} oLeft control to be checked
+	 * @param {sap.m.ObjectAttribute} oLeft control to be checked
 	 *
 	 * @param {sap.ui.core.Control[]} aRight array of controls to be checked
 	 *
@@ -161,7 +161,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.m.ObjectHeader} oOH the ObjectHeader that contains markers
 	 *
-	 * @returns {Array} array of {sap.m.ObjectMarker} controls
+	 * @returns {sap.m.ObjectMarker[]} array of ObjectMarker controls
 	 *
 	 * @private
 	 */
@@ -231,7 +231,7 @@ sap.ui.define([
 	 * sap.m.ProgressIndicator and returns only the visible once that should be rendered
 	 *
 	 * @param {sap.m.ObjectHeader} oOH an object to be rendered
-	 * @returns {array} The visible statuses
+	 * @returns {Array<sap.m.ObjectStatus|sap.m.ProgressIndicator>} The visible statuses
 	 * @private
 	 */
 	ObjectHeaderRenderer._getVisibleStatuses = function(oOH) {

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.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectIdentifierRenderer.js

@@ -29,7 +29,7 @@ sap.ui.define(['./library', 'sap/ui/core/Core'],
 	 * @param {sap.ui.core.RenderManager}
 	 *            oRm The RenderManager that can be used for writing to the render
 	 *            output buffer
-	 * @param {sap.ui.core.Control}
+	 * @param {sap.m.ObjectIdentifier}
 	 *            oOI An object representation of the control that should be
 	 *            rendered
 	 */

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.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ObjectListItemRenderer.js

@@ -94,7 +94,7 @@ sap.ui.define(['./ListItemBaseRenderer', 'sap/ui/core/Renderer', 'sap/ui/core/li
 		 *
 		 * @param {sap.ui.core.RenderManager} rm The RenderManager that can be used for writing to the
 		 *          Render-Output-Buffer
-		 * @param {sap.ui.core.Control} oLI An object representation of the control that should be
+		 * @param {sap.m.ObjectListItem} oLI An object representation of the control that should be
 		 *          rendered
 		 */
 		ObjectListItemRenderer.renderLIAttributes = function(rm, oLI) {
@@ -216,7 +216,7 @@ sap.ui.define(['./ListItemBaseRenderer', 'sap/ui/core/Renderer', 'sap/ui/core/li
 		 *
 		 * @param {sap.m.ObjectListItem}
 		 *			oLI An object representation of the control
-		 * @returns {String} ObjectListItem`s inner nodes IDs
+		 * @returns {string} ObjectListItem`s inner nodes IDs
 		 */
 		ObjectListItemRenderer.getAriaLabelledBy = function(oLI) {
 			var aLabelledByIds = [],