@openui5/sap.m 1.96.5 → 1.99.0

package/src/sap/m/ListBaseRenderer.js

@@ -49,7 +49,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	 * @param {sap.ui.core.RenderManager}
 	 *          oRenderManager the RenderManager that can be used for writing to the
 	 *          Render-Output-Buffer
-	 * @param {sap.ui.core.Control}
+	 * @param {sap.m.ListBase}
 	 *          oControl an object representation of the control that should be
 	 *          rendered
 	 */
@@ -209,7 +209,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	 * This hook method is called to render container attributes
 	 *
 	 * @param {sap.ui.core.RenderManager} rm 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.ListBase} oControl an object representation of the control that should be rendered
 	 */
 	ListBaseRenderer.renderContainerAttributes = function(rm, oControl) {
 	};
@@ -218,7 +218,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	 * This hook method is called after <ul> and before first <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} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.ListBase} oControl an object representation of the control that should be rendered
 	 */
 	ListBaseRenderer.renderListHeadAttributes = function(rm, oControl) {
 	};
@@ -227,7 +227,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	 * This hook method is called to render list tag
 	 *
 	 * @param {sap.ui.core.RenderManager} rm 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.ListBase} oControl an object representation of the control that should be rendered
 	 */
 	ListBaseRenderer.renderListStartAttributes = function(rm, oControl) {
 		rm.openStart("ul", oControl.getId("listUl"));
@@ -241,8 +241,8 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	/**
 	 * Returns aria accessibility role
 	 *
-	 * @param {sap.ui.core.Control} oControl an object representation of the control
-	 * @returns {String}
+	 * @param {sap.m.ListBase} oControl an object representation of the control
+	 * @returns {string}
 	 */
 	ListBaseRenderer.getAriaRole = function(oControl) {
 		return "listbox";
@@ -251,7 +251,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	/**
 	 * Returns aria accessibility role for the no data entry.
 	 *
-	 * @returns {String}
+	 * @returns {string}
 	 */
 	ListBaseRenderer.getNoDataAriaRole = function() {
 		return null;
@@ -260,8 +260,8 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	/**
 	 * Returns the inner aria labelledby ids for the accessibility
 	 *
-	 * @param {sap.ui.core.Control} oControl an object representation of the control
-	 * @returns {String|undefined} header id
+	 * @param {sap.m.ListBase} oControl an object representation of the control
+	 * @returns {string|undefined} header id
 	 */
 	ListBaseRenderer.getAriaLabelledBy = function(oControl) {
 		var oHeaderTBar = oControl.getHeaderToolbar();
@@ -281,8 +281,8 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	/**
 	 * Returns the inner aria describedby ids for the accessibility
 	 *
-	 * @param {sap.ui.core.Control} oControl an object representation of the control
-	 * @returns {String|undefined}
+	 * @param {sap.m.ListBase} oControl an object representation of the control
+	 * @returns {string|undefined}
 	 */
 	ListBaseRenderer.getAriaDescribedBy = function(oControl) {
 		if (oControl.getFooterText()) {
@@ -293,7 +293,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	/**
 	 * Returns the accessibility state of the control
 	 *
-	 * @param {sap.ui.core.Control} oControl an object representation of the control
+	 * @param {sap.m.ListBase} oControl an object representation of the control
 	 */
 	ListBaseRenderer.getAccessibilityState = function(oControl) {
 		var sRole = this.getAriaRole(oControl);
@@ -315,7 +315,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	 * This hook method is called to finish list rendering
 	 *
 	 * @param {sap.ui.core.RenderManager} rm 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.ListBase} oControl an object representation of the control that should be rendered
 	 */
 	ListBaseRenderer.renderListEndAttributes = function(rm, oControl) {
 		rm.close("ul");
@@ -325,7 +325,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	 * This hook method is called to render no data field
 	 *
 	 * @param {sap.ui.core.RenderManager} rm 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.ListBase} oControl an object representation of the control that should be rendered
 	 */
 	ListBaseRenderer.renderNoData = function(rm, oControl) {
 		rm.openStart("li", oControl.getId("nodata"));
@@ -371,8 +371,8 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	 *
 	 * This method should be used when text is used frequently.
 	 *
-	 * @param {String} sBundleText bundle key of the announcement
-	 * @returns {String} id of the generated invisible ARIA node
+	 * @param {string} sBundleText bundle key of the announcement
+	 * @returns {string} id of the generated invisible ARIA node
 	 * @protected
 	 */
 	ListBaseRenderer.getAriaAnnouncement = function(sBundleText) {

package/src/sap/m/ListItemBase.js

@@ -76,7 +76,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public
@@ -697,7 +697,7 @@ function(
 	/**
 	 * Destroys generated mode/type controls
 	 *
-	 * @param {String[]} aControls array of control names
+	 * @param {string[]} aControls array of control names
 	 * @private
 	 */
 	ListItemBase.prototype.destroyControls = function(aControls) {

package/src/sap/m/ListItemBaseRenderer.js

@@ -33,7 +33,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Renders the highlight state.
 	 *
 	 * @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 is rendered.
+	 * @param {sap.m.ListItemBase} oLI An object representation of the control that is rendered.
 	 * @protected
 	 */
 	ListItemBaseRenderer.renderHighlight = function(rm, oLI) {
@@ -58,7 +58,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Renders the mode when item mode is in correct order
 	 *
 	 * @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 rendered.
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control that should be rendered.
 	 * @param {int} [iOrder] expected order for the rendering
 	 * @protected
 	 */
@@ -108,7 +108,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Renders counter if it is not empty
 	 *
 	 * @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 is rendered.
+	 * @param {sap.m.ListItemBase} oLI An object representation of the control that is rendered.
 	 * @protected
 	 */
 	ListItemBaseRenderer.renderCounter = function(rm, oLI) {
@@ -131,7 +131,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Renders type for the list item
 	 *
 	 * @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 rendered.
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control that should be rendered.
 	 * @protected
 	 */
 	ListItemBaseRenderer.renderType = function(rm, oLI) {
@@ -145,7 +145,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Renders list item HTML starting tag
 	 *
 	 * @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 rendered.
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control that should be rendered.
 	 * @protected
 	 */
 	ListItemBaseRenderer.openItemTag = function(rm, oLI) {
@@ -156,7 +156,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Renders list item HTML closing tag
 	 *
 	 * @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 rendered.
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control that should be rendered.
 	 * @protected
 	 */
 	ListItemBaseRenderer.closeItemTag = function(rm, oLI) {
@@ -178,7 +178,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Adds the classes needed to recognize the element as focusable.
 	 *
 	 * @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 rendered
+	 * @param {sap.m.ListItemBase} [oLI] an object representation of the control that should be rendered
 	 * @protected
 	 */
 	ListItemBaseRenderer.addFocusableClasses = function(rm, oLI) {
@@ -192,7 +192,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Adds the classes for legacy browsers, which do not support normal outlines.
 	 *
 	 * @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 rendered
+	 * @param {sap.m.ListItemBase} [oLI] an object representation of the control that should be rendered
 	 * @protected
 	 */
 	ListItemBaseRenderer.addLegacyOutlineClass = function(rm, oLI) {};
@@ -203,9 +203,9 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 *
 	 * This method should be used when text is reached frequently.
 	 *
-	 * @param {String} sKey key of the announcement
-	 * @param {String} [sBundleText] key of the announcement
-	 * @returns {String} id of the generated invisible aria node
+	 * @param {string} sKey key of the announcement
+	 * @param {string} [sBundleText] key of the announcement
+	 * @returns {string} id of the generated invisible aria node
 	 * @protected
 	 */
 	ListItemBaseRenderer.getAriaAnnouncement = function(sKey, sBundleText) {
@@ -216,8 +216,8 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	/**
 	 * Returns aria accessibility role
 	 *
-	 * @param {sap.ui.core.Control} oLI an object representation of the control
-	 * @returns {String}
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control
+	 * @returns {string}
 	 * @protected
 	 */
 	ListItemBaseRenderer.getAriaRole = function(oLI) {
@@ -227,8 +227,8 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	/**
 	 * Returns the inner aria labelledby ids for the accessibility
 	 *
-	 * @param {sap.ui.core.Control} oLI an object representation of the control
-	 * @returns {String|undefined}
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control
+	 * @returns {string|undefined}
 	 * @protected
 	 */
 	ListItemBaseRenderer.getAriaLabelledBy = function(oLI) {
@@ -240,8 +240,8 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	/**
 	 * Returns the inner aria describedby ids for the accessibility
 	 *
-	 * @param {sap.ui.core.Control} oLI an object representation of the control
-	 * @returns {String|undefined}
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control
+	 * @returns {string|undefined}
 	 * @protected
 	 */
 	ListItemBaseRenderer.getAriaDescribedBy = function(oLI) {
@@ -277,7 +277,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	/**
 	 * Returns the accessibility state of the control
 	 *
-	 * @param {sap.ui.core.Control} oLI an object representation of the control
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control
 	 * @protected
 	 */
 	ListItemBaseRenderer.getAccessibilityState = function(oLI) {
@@ -316,7 +316,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Hook for rendering list item contents
 	 *
 	 * @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 rendered.
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control that should be rendered.
 	 * @protected
 	 */
 	ListItemBaseRenderer.renderLIContent = function(rm, oLI) {
@@ -326,7 +326,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Hook for changing list item attributes
 	 *
 	 * @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 rendered.
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control that should be rendered.
 	 * @protected
 	 */
 	ListItemBaseRenderer.renderLIAttributes = function(rm, oLI) {
@@ -336,7 +336,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Renders the former part of the item.
 	 *
 	 * @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 is rendered.
+	 * @param {sap.m.ListItemBase} oLI An object representation of the control that is rendered.
 	 * @protected
 	 */
 	ListItemBaseRenderer.renderContentFormer = function(rm, oLI) {
@@ -348,7 +348,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * Renders the latter part of the item.
 	 *
 	 * @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 is rendered.
+	 * @param {sap.m.ListItemBase} oLI An object representation of the control that is rendered.
 	 * @protected
 	 */
 	ListItemBaseRenderer.renderContentLatter = function(rm, oLI) {
@@ -381,7 +381,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 	 * {@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} oLI an object representation of the control that should be rendered.
+	 * @param {sap.m.ListItemBase} oLI an object representation of the control that should be rendered.
 	 * @public
 	 */
 	ListItemBaseRenderer.render = function(rm, oLI) {

package/src/sap/m/MaskEnabler.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * Applies mask support for input controls.
 	 * It should should be applied to the prototype of a <code>sap.m.InputBase</code>.
 	 *
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @private
 	 * @mixin
 	 * @alias sap.m.MaskEnabler
@@ -384,7 +384,7 @@ sap.ui.define([
 
 		/**
 		 * Overrides the method in order to validate the placeholder symbol.
-		 * @param {String} sSymbol The placeholder symbol
+		 * @param {string} sSymbol The placeholder symbol
 		 * @override
 		 * @returns {sap.ui.base.MaskInput} <code>this</code> pointer for chaining
 		 */
@@ -415,7 +415,7 @@ sap.ui.define([
 		/**
 		 * Sets the mask for this instance.
 		 * The mask is mandatory.
-		 * @param {String} sMask The mask
+		 * @param {string} sMask The mask
 		 * @returns {sap.m.MaskInput} <code>this</code> pointer for chaining
 		 * @throws {Error} Throws an error if the input is invalid
 		 */
@@ -432,7 +432,7 @@ sap.ui.define([
 
 		/**
 		 * Verifies whether a character at a given position is allowed according to its mask rule.
-		 * @param {String} sChar The character
+		 * @param {string} sChar The character
 		 * @param {int} iIndex The position of the character
 		 * @returns {boolean} Whether a character at a given position is allowed
 		 * @protected
@@ -446,10 +446,10 @@ sap.ui.define([
 		 * Subclasses may override this method in order to get some additional behavior. For instance, switching current input
 		 * character with other for time input purposes. As an example, if the user enters "2" (in 12-hour format), the consumer may use
 		 * this method to replace the input from "2" to "02".
-		 * @param {String} sChar The current character from the input
+		 * @param {string} sChar The current character from the input
 		 * @param {int} iPlacePosition The position the character should occupy
 		 * @param {string} sCurrentInputValue The value currently inside the input field (may differ from the property value)
-		 * @returns {String} A string that replaces the character
+		 * @returns {string} A string that replaces the character
 		 * @protected
 		 */
 		this._feedReplaceChar = function (sChar, iPlacePosition, sCurrentInputValue) {
@@ -507,7 +507,7 @@ sap.ui.define([
 
 		/**
 		 * Converts the char array to a string representation.
-		 * @returns {String} The char array converted to a string
+		 * @returns {string} The char array converted to a string
 		 * @private
 		 */
 		CharArray.prototype.toString = function () {
@@ -602,7 +602,7 @@ sap.ui.define([
 
 		/**
 		 * Applies a rule to a character.
-		 * @param {String} sChar The character to which the rule will be applied
+		 * @param {string} sChar The character to which the rule will be applied
 		 * @param {int} iIndex The index of the rule
 		 * @returns {boolean} True if the character passes the validation rule, false otherwise.
 		 * @private
@@ -855,7 +855,7 @@ sap.ui.define([
 
 		/**
 		 * Applies rules and updates the DOM input value.
-		 * @param {String} sMaskInputValue The input string to which the rules will be applied
+		 * @param {string} sMaskInputValue The input string to which the rules will be applied
 		 * @private
 		 */
 		this._applyAndUpdate = function (sMaskInputValue) {
@@ -1163,7 +1163,7 @@ sap.ui.define([
 
 		/**
 		 * @param {Array} aMask The mask from which the mask value array will be built
-		 * @param {String} sPlaceholderSymbol The symbol marker of the mask
+		 * @param {string} sPlaceholderSymbol The symbol marker of the mask
 		 * @param {Array} aRules The rules from which the mask value array is built
 		 * @param {Array} aSkipIndexes @since 1.38 List of indexes to skip
 		 * @private
@@ -1313,7 +1313,7 @@ sap.ui.define([
 		/**
 		 * Checks if a given character belongs to an RTL language
 		 * @private
-		 * @param {String} sString The checked character
+		 * @param {string} sString The checked character
 		 * @returns {boolean} Whether a given character belongs to an RTL language
 		 */
 		this._isRtlChar = function (sString) {

package/src/sap/m/MaskInput.js

@@ -19,9 +19,17 @@ sap.ui.define(['./InputBase', './MaskEnabler', './MaskInputRenderer'], function(
 	 * The <code>sap.m.MaskInput</code> control allows users to easily enter data in a certain format and in a fixed-width input
 	 * (for example: date, time, phone number, credit card number, currency, IP address, MAC address, and others).
 	 *
+	 * When focused, the masked input field is formatted and prefilled. The <code>placeholderSymbol</code> property value is reserved for a placeholder.
+	 * The value that has to be entered in this field is in the <code>mask</code> property value format where every symbol corresponds to a rule.
+	 * A rule is a set of characters that are allowed for their particular position.
+	 * Symbols that do not have a rule are immutable characters and are part of the value formatting.
+	 *
+	 * <b<Note:</b> Descriptive text as <code>placeholder</code> property value should be added,
+	 * in order guide users what input is expected based on the particular control configuration.
+	 *
 	 * @author SAP SE
 	 * @extends sap.m.InputBase
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MaskInputRenderer.js

@@ -16,54 +16,20 @@ sap.ui.define(['sap/ui/core/Renderer', './InputBaseRenderer'], function(Renderer
 	MaskInputRenderer.apiVersion = 2;
 
 	/**
-	 * Returns the inner aria labelledby announcement texts for the accessibility.
+	 * Returns the accessibility state of the control.
 	 *
 	 * @override
-	 * @param {sap.ui.core.Control} oControl an object representation of the control.
-	 * @returns {String} The inner aria labelledby announcement texts
+	 * @param {sap.m.MaskInput} oControl an object representation of the control.
+	 * @returns {Object}
 	 */
-	MaskInputRenderer.getLabelledByAnnouncement = function(oControl) {
-		var sMask = oControl.getMask(),
-			sPlaceholder = oControl.getPlaceholder() || "",
-			oResourceBundle,
-			sMaskScreenReaderTag,
-			sAnnouncement = "";
+	MaskInputRenderer.getAccessibilityState = function (oControl) {
+		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m"),
+			sCustomRole = oResourceBundle.getText("MASKINPUT_ROLE_DESCRIPTION"),
+			mAccessibilityState = InputBaseRenderer.getAccessibilityState.apply(this, arguments);
 
-		if (sMask && sMask.length) {
-			oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
-			sMaskScreenReaderTag = oResourceBundle.getText("MASKINPUT_SCREENREADER_TAG");
+		mAccessibilityState["roledescription"] = sCustomRole;
 
-			if (sPlaceholder) {
-				sPlaceholder = " " + sPlaceholder + " ";
-			}
-			sAnnouncement = sMaskScreenReaderTag + sPlaceholder;
-			return sAnnouncement;
-		}
-
-		return InputBaseRenderer.getLabelledByAnnouncement.apply(this, arguments);
-	};
-
-	/**
-	 * Returns the inner aria describedby announcement texts for the accessibility.
-	 * Hook for the subclasses.
-	 *
-	 * @param {sap.ui.core.Control} oControl an object representation of the control.
-	 * @returns {String} The inner aria describedby announcement texts
-	 */
-	MaskInputRenderer.getDescribedByAnnouncement = function(oControl) {
-		var sMask = oControl.getMask(),
-			sMaskPlaceholderSymbol = oControl.getPlaceholderSymbol(),
-			oResourceBundle,
-			sAnnouncement = "";
-
-		if (sMask.length && sMaskPlaceholderSymbol) {
-			oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
-			sAnnouncement = oResourceBundle.getText("MASKINPUT_SCREENREADER_DESCRIPTION", [sMaskPlaceholderSymbol, sMask]);
-
-			return sAnnouncement.trim();
-		}
-
-		return InputBaseRenderer.getDescribedByAnnouncement.apply(this, arguments);
+		return mAccessibilityState;
 	};
 
 	return MaskInputRenderer;

package/src/sap/m/MaskInputRule.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log"], function(Element, Log) {
 	 *
 	 * @author SAP SE
 	 * @extends sap.ui.core.Element
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @public
 	 * @constructor
 	 * @since 1.34.0
@@ -48,7 +48,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log"], function(Element, Log) {
 	/*
 	 * Sets <code>maskFormatSymbol</code> property.
 	 * @override
-	 * @param {String} sNewMaskFormatSymbol The new format symbol
+	 * @param {string} sNewMaskFormatSymbol The new format symbol
 	 * @returns {this} The <code>this</code> pointer for chaining
 	 */
 	MaskInputRule.prototype.setMaskFormatSymbol = function (sNewMaskFormatSymbol) {
@@ -63,7 +63,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log"], function(Element, Log) {
 	/*
 	 * Sets <code>regex</code> property.
 	 * @override
-	 * @param {String} sNewRegex The new regular expression
+	 * @param {string} sNewRegex The new regular expression
 	 * @returns {this} The <code>this</code> pointer for chaining
 	 */
 	MaskInputRule.prototype.setRegex = function (sNewRegex) {
@@ -77,7 +77,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log"], function(Element, Log) {
 
 	/**
 	 * Converts the rule into a string.
-	 * @returns {String} String representation of this instance
+	 * @returns {string} String representation of this instance
 	 */
 	MaskInputRule.prototype.toString = function(){
 		return this.getMaskFormatSymbol() + ":" + this.getRegex();
@@ -103,7 +103,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log"], function(Element, Log) {
 
 	/**
 	 * Checks if the specified regular expression is valid.
-	 * @param {String} sRegex The regular expression string to be validated
+	 * @param {string} sRegex The regular expression string to be validated
 	 * @returns {boolean} True of the specified regular expression string is valid, false otherwise
 	 * @private
 	 */

package/src/sap/m/Menu.js

@@ -68,7 +68,7 @@ sap.ui.define([
 		 * @implements sap.ui.core.IContextMenu
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public
@@ -251,9 +251,9 @@ sap.ui.define([
 		 */
 		Menu.prototype.close = function() {
 			if (Device.system.phone) {
-				this._getDialog().close();
+				this._getDialog() && this._getDialog().close();
 			} else {
-				this._getVisualParent().close();
+				this._getVisualParent() && this._getVisualParent().close();
 			}
 		};
 

package/src/sap/m/MenuButton.js

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public
@@ -339,6 +339,7 @@ sap.ui.define([
 				ariaHasPopup: coreLibrary.aria.HasPopup.Menu
 			});
 			oBtn.attachPress(this._handleButtonPress, this);
+			oBtn.onkeydown = this.handleKeydown;
 			return oBtn;
 		};
 
@@ -353,6 +354,7 @@ sap.ui.define([
 			});
 			oBtn.attachPress(this._handleActionPress, this);
 			oBtn.attachArrowPress(this._handleButtonPress, this);
+			oBtn._getArrowButton().onkeydown = this.handleKeydown;
 			return oBtn;
 		};
 
@@ -738,11 +740,13 @@ sap.ui.define([
 			this._bPopupOpen = this.getMenu() && this.getMenu()._getMenu() && this.getMenu()._getMenu().getPopup().isOpen();
 		};
 
-		MenuButton.prototype.onkeydown = function(oEvent) {
+		MenuButton.prototype.handleKeydown = function(oEvent) {
 			if ((oEvent.keyCode === KeyCodes.ENTER || oEvent.keyCode === KeyCodes.TAB) && this._bPopupOpen) {
 				this.getMenu().close();
 				this._bPopupOpen = false;
 			}
+
+			Button.prototype.onkeydown.call(this, oEvent);
 		};
 
 		MenuButton.prototype.openMenuByKeyboard = function() {

package/src/sap/m/MenuButtonRenderer.js

@@ -25,7 +25,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} oMenuButton
+		 * @param {sap.m.MenuButton} oMenuButton
 		 *            The MenuButton to be rendered
 		 */
 		MenuButtonRenderer.render = function(oRm, oMenuButton) {

package/src/sap/m/MenuItem.js

@@ -23,7 +23,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserv
 		 * @extends sap.ui.core.Item
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MenuListItem.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/MenuListItemRenderer.js

@@ -26,7 +26,7 @@ sap.ui.define(['./ListItemBaseRenderer', 'sap/ui/core/Renderer', 'sap/m/library'
 		 * Renders the HTML starting tag of the <code>MenuListItem</code>.
 		 *
 		 * @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 rendered
+		 * @param {sap.m.MenuListItem} oLI an object representation of the control that should be rendered
 		 * @protected
 		 */
 		MenuListItemRenderer.openItemTag = function(rm, oLI) {
@@ -57,7 +57,7 @@ sap.ui.define(['./ListItemBaseRenderer', 'sap/ui/core/Renderer', 'sap/m/library'
 		 * @param {sap.ui.core.RenderManager}
 		 *          rm the RenderManager that can be used for writing to the
 		 *          Render-Output-Buffer
-		 * @param {sap.ui.core.Control}
+		 * @param {sap.m.MenuListItem}
 		 *          oLI an object representation of the control that should be
 		 *          rendered
 		 */

package/src/sap/m/MessageItem.js

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

package/src/sap/m/MessageListItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 		 * @extends sap.m.StandardListItem
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @private