@openui5/sap.m 1.98.0 → 1.101.0

package/src/sap/m/NavContainer.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -671,24 +671,24 @@ sap.ui.define([
 	 *
 	 * Calling this navigation method triggers first the (cancelable) "navigate" event on the NavContainer, then the "BeforeHide" pseudo event on the source page and "BeforeFirstShow" (if applicable) and"BeforeShow" on the target page. Later - after the transition has completed - the "AfterShow" pseudo event is triggered on the target page and "AfterHide" on the page which has been left. The given data object is available in the "BeforeFirstShow", "BeforeShow" and "AfterShow" event object as "data" property.
 	 *
-	 * @param {string} pageId
+	 * @param {string} vPageIdOrControl
 	 *         The screen to which drilldown should happen. The ID or the control itself can be given.
-	 * @param {string} [transitionName=slide]
+	 * @param {string} [sTransitionName=slide]
 	 *         The type of the transition/animation to apply. Options are "slide" (horizontal movement from the right), "baseSlide", "fade", "flip", and "show"
 	 *         and the names of any registered custom transitions.
 	 *
 	 *         None of the standard transitions is currently making use of any given transition parameters.
-	 * @param {object} data
+	 * @param {object} [oData={}]
 	 *         Since version 1.7.1. This optional object can carry any payload data which should be made available to the target page.
 	 *         The "BeforeShow" event on the target page will contain this data object as "data" property.
 
 	 *         Use case: in scenarios where the entity triggering the navigation can or should not directly initialize the target page, it can fill this object and the target page itself (or a listener on it) can take over the initialization, using the given data.
 	 *
-	 *         When the "transitionParameters" object is used, this "data" object must also be given (either as object or as null) in order to have a proper parameter order.
-	 * @param {object} oTransitionParameters
+	 *         When the <code>oTransitionParameters</code> parameter is used, this <code>oData</code> parameter must also be given (either as object or as <code>null</code> or <code>undefined</code>) in order to have a proper parameter order.
+	 * @param {object} [oTransitionParameters={}]
 	 *         Since version 1.7.1. This optional object can contain additional information for the transition function, like the DOM element which triggered the transition or the desired transition duration.
 	 *
-	 *         For a proper parameter order, the "data" parameter must be given when the "transitionParameters" parameter is used. (it can be given as "null")
+	 *         For a proper parameter order, the <code>oData</code> parameter must be given when the <code>oTransitionParameters</code> parameter is used (it can be given as <code>null</code> or <code>undefined</code>).
 	 *
 	 *         NOTE: it depends on the transition function how the object should be structured and which parameters are actually used to influence the transition.
 	 *         The "show", "slide", "baseSlide" and "fade" transitions do not use any parameter.
@@ -696,44 +696,44 @@ sap.ui.define([
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 * @returns {this} The <code>sap.m.NavContainer</code> instance
 	 */
-	NavContainer.prototype.to = function (pageId, transitionName, data, oTransitionParameters, bFromQueue) {
-		if (pageId instanceof Control) {
-			pageId = pageId.getId();
+	NavContainer.prototype.to = function (vPageIdOrControl, sTransitionName, oData, oTransitionParameters, bFromQueue) {
+		if (vPageIdOrControl instanceof Control) {
+			vPageIdOrControl = vPageIdOrControl.getId();
 		}
 
 		// fix parameters
-		if (typeof (transitionName) !== "string") {
-			// transitionName is omitted, shift parameters
-			oTransitionParameters = data;
-			data = transitionName;
+		if (typeof (sTransitionName) !== "string") {
+			// sTransitionName is omitted, shift parameters
+			oTransitionParameters = oData;
+			oData = sTransitionName;
 		}
-		transitionName = transitionName || this.getDefaultTransitionName();
+		sTransitionName = sTransitionName || this.getDefaultTransitionName();
 		oTransitionParameters = oTransitionParameters || {};
-		data = data || {};
-		var oFromPageInfo = {id: pageId, transition: transitionName, data: data};
+		oData = oData || {};
+		var oFromPageInfo = {id: vPageIdOrControl, transition: sTransitionName, data: oData};
 
 		// make sure the initial page is on the stack
-		this._ensurePageStackInitialized(data);
+		this._ensurePageStackInitialized(oData);
 
 		//add to the queue before checking the current page, because this might change
 		if (this._bNavigating) {
-			Log.info(this.toString() + ": Cannot navigate to page " + pageId + " because another navigation is already in progress. - navigation will be executed after the previous one");
+			Log.info(this.toString() + ": Cannot navigate to page " + vPageIdOrControl + " because another navigation is already in progress. - navigation will be executed after the previous one");
 
 			this._aQueue.push(jQuery.proxy(function () {
-				this.to(pageId, transitionName, data, oTransitionParameters, true);
+				this.to(vPageIdOrControl, sTransitionName, oData, oTransitionParameters, true);
 			}, this));
 
 			return this;
 		}
 
-		// If to is called before rendering, remember the data so we can pass it to the events as soon as the navContainer gets rendered
+		// If to is called before rendering, remember the oData so we can pass it to the events as soon as the navContainer gets rendered
 		if (this._bNeverRendered) {
-			this._oToDataBeforeRendering = data;
+			this._oToDataBeforeRendering = oData;
 		}
 
 		var oFromPage = this.getCurrentPage();
-		if (oFromPage && (oFromPage.getId() === pageId)) { // cannot navigate to the page that is already current
-			Log.warning(this.toString() + ": Cannot navigate to page " + pageId + " because this is the current page.");
+		if (oFromPage && (oFromPage.getId() === vPageIdOrControl)) { // cannot navigate to the page that is already current
+			Log.warning(this.toString() + ": Cannot navigate to page " + vPageIdOrControl + " because this is the current page.");
 			if (bFromQueue) {
 				this._dequeueNavigation();
 			}
@@ -746,11 +746,11 @@ sap.ui.define([
 			return this;
 		}
 
-		var oToPage = this.getPage(pageId);
+		var oToPage = this.getPage(vPageIdOrControl);
 
 		if (oToPage) {
 			if (!oFromPage) {
-				Log.warning("Navigation triggered to page with ID '" + pageId + "', but the current page is not known/aggregated by " + this);
+				Log.warning("Navigation triggered to page with ID '" + vPageIdOrControl + "', but the current page is not known/aggregated by " + this);
 				return this;
 			}
 
@@ -758,8 +758,8 @@ sap.ui.define([
 				from: oFromPage,
 				fromId: oFromPage.getId(),
 				to: oToPage,
-				toId: pageId,
-				firstTime: !this._mVisitedPages[pageId],
+				toId: vPageIdOrControl,
+				firstTime: !this._mVisitedPages[vPageIdOrControl],
 				isTo: true,
 				isBack: false,
 				isBackToTop: false,
@@ -781,27 +781,27 @@ sap.ui.define([
 				// TODO: let one of the pages also cancel navigation?
 				var oEvent = jQuery.Event("BeforeHide", oNavInfo);
 				oEvent.srcControl = this; // store the element on the event (aligned with jQuery syntax)
-				// no data needed for hiding
+				// no oData needed for hiding
 				oFromPage._handleEvent(oEvent);
 
-				if (!this._mVisitedPages[pageId]) { // if this page has not been shown before
+				if (!this._mVisitedPages[vPageIdOrControl]) { // if this page has not been shown before
 					oEvent = jQuery.Event("BeforeFirstShow", oNavInfo);
 					oEvent.srcControl = this;
-					oEvent.data = data || {};
+					oEvent.data = oData || {};
 					oEvent.backData = {};
 					oToPage._handleEvent(oEvent);
 				}
 
 				oEvent = jQuery.Event("BeforeShow", oNavInfo);
 				oEvent.srcControl = this;
-				oEvent.data = data || {};
+				oEvent.data = oData || {};
 				oEvent.backData = {};
 				oToPage._handleEvent(oEvent);
 
 
 				this._pageStack.push(oFromPageInfo); // this actually causes/is the navigation
-				Log.info(this.toString() + ": navigating to page '" + pageId + "': " + oToPage.toString());
-				this._mVisitedPages[pageId] = true;
+				Log.info(this.toString() + ": navigating to page '" + vPageIdOrControl + "': " + oToPage.toString());
+				this._mVisitedPages[vPageIdOrControl] = true;
 
 				if (!this.getDomRef()) { // the wanted animation has been recorded, but when the NavContainer is not rendered, we cannot animate, so just return
 					Log.info("'Hidden' 'to' navigation in not-rendered NavContainer " + this.toString());
@@ -826,33 +826,33 @@ sap.ui.define([
 					oToPage.addStyleClass("sapMNavItemHidden").removeStyleClass("sapMNavItemRendering");
 				}
 
-				var oTransition = NavContainer.transitions[transitionName] || NavContainer.transitions["slide"];
+				var oTransition = NavContainer.transitions[sTransitionName] || NavContainer.transitions["slide"];
 				// Track proper invocation of the callback  TODO: only do this during development?
 				var iCompleted = this._iTransitionsCompleted;
 				var that = this;
 				window.setTimeout(function () {
 					if (that && (that._iTransitionsCompleted < iCompleted + 1)) {
-						Log.warning("Transition '" + transitionName + "' 'to' was triggered five seconds ago, but has not yet invoked the end-of-transition callback.");
+						Log.warning("Transition '" + sTransitionName + "' 'to' was triggered five seconds ago, but has not yet invoked the end-of-transition callback.");
 					}
 				}, fnGetDelay(5000));
 
 				this._bNavigating = true;
 
 				// check both params since they might have shifted
-				var sTransitionDirection = (data.safeBackToPage || oTransitionParameters.safeBackToPage) ? "back" : "to";
+				var sTransitionDirection = (oData.safeBackToPage || oTransitionParameters.safeBackToPage) ? "back" : "to";
 
-				this._cacheTransitionInfo(transitionName, sTransitionDirection);
+				this._cacheTransitionInfo(sTransitionName, sTransitionDirection);
 
 				oTransition[sTransitionDirection].call(this, oFromPage, oToPage, jQuery.proxy(function () {
-					this._afterTransitionCallback(oNavInfo, data);
+					this._afterTransitionCallback(oNavInfo, oData);
 				}, this), oTransitionParameters); // trigger the transition
 
 			} else {
-				Log.info("Navigation to page with ID '" + pageId + "' has been aborted by the application");
+				Log.info("Navigation to page with ID '" + vPageIdOrControl + "' has been aborted by the application");
 			}
 
 		} else {
-			Log.warning("Navigation triggered to page with ID '" + pageId + "', but this page is not known/aggregated by " + this);
+			Log.warning("Navigation triggered to page with ID '" + vPageIdOrControl + "', but this page is not known/aggregated by " + this);
 		}
 		return this;
 	};
@@ -863,18 +863,18 @@ sap.ui.define([
 	 *
 	 * Calling this navigation method triggers first the (cancelable) "navigate" event on the NavContainer, then the "BeforeHide" pseudo event on the source page and "BeforeFirstShow" (if applicable) and"BeforeShow" on the target page. Later - after the transition has completed - the "AfterShow" pseudo event is triggered on the target page and "AfterHide" on the page which has been left. The given backData object is available in the "BeforeFirstShow", "BeforeShow" and "AfterShow" event object as "data" property. The original "data" object from the "to" navigation is also available in these event objects.
 	 *
-	 * @param {object} [backData]
+	 * @param {object} [backData={}]
 	 *         Since version 1.7.1. This optional object can carry any payload data which should be made available to the target page of the back navigation. The event on the target page will contain this data object as "backData" property. (The original data from the "to()" navigation will still be available as "data" property.)
 	 *
 	 *         In scenarios where the entity triggering the navigation can or should not directly initialize the target page, it can fill this object and the target page itself (or a listener on it) can take over the initialization, using the given data.
 	 *         For back navigation this can be used e.g. when returning from a detail page to transfer any settings done there.
 	 *
-	 *         When the "transitionParameters" object is used, this "data" object must also be given (either as object or as null) in order to have a proper parameter order.
-	 * @param {object} [oTransitionParameters]
+	 *         When the <code>oTransitionParameters</code> parameter is used, this <code>backData</code> parameter must also be given (either as object or as <code>null</code> or <code>undefined</code>) in order to have a proper parameter order.
+	 * @param {object} [oTransitionParameters={}]
 	 *         Since version 1.7.1. This optional object can give additional information to the transition function, like the DOM element which triggered the transition or the desired transition duration.
 	 *         The animation type can NOT be selected here - it is always the inverse of the "to" navigation.
 	 *
-	 *         In order to use the "transitionParameters" property, the "data" property must be used (at least "null" must be given) for a proper parameter order.
+	 *         In order to use the <code>oTransitionParameters<code> parameter, the <code>backData</code> parameter must be used (at least <code>null</code> or <code>undefined</code> must be given) for a proper parameter order.
 	 *
 	 *         NOTE: it depends on the transition function how the object should be structured and which parameters are actually used to influence the transition.
 	 * @public
@@ -895,15 +895,15 @@ sap.ui.define([
 	 *
 	 * @param {string} pageId
 	 *         The ID of the screen to which back navigation should happen. The ID or the control itself can be given. The nearest such page among the previous pages in the history stack will be used.
-	 * @param {object} backData
+	 * @param {object} [backData={}]
 	 *         This optional object can carry any payload data which should be made available to the target page of the "backToPage" navigation. The event on the target page will contain this data object as "backData" property.
 	 *
-	 *         When the "transitionParameters" object is used, this "data" object must also be given (either as object or as null) in order to have a proper parameter order.
-	 * @param {object} oTransitionParameters
+	 *         When the <code>oTransitionParameters</code> parameter is used, this <code>backData</code> parameter must also be given (either as object or as <code>null</code> or <code>undefined</code>) in order to have a proper parameter order.
+	 * @param {object} [oTransitionParameters={}]
 	 *         This optional object can give additional information to the transition function, like the DOM element which triggered the transition or the desired transition duration.
 	 *         The animation type can NOT be selected here - it is always the inverse of the "to" navigation.
 	 *
-	 *         In order to use the "transitionParameters" property, the "data" property must be used (at least "null" must be given) for a proper parameter order.
+	 *         In order to use the <code>oTransitionParameters<code> parameter, the <code>backData</code> parameter must be used (at least <code>null</code> or <code>undefined</code> must be given) for a proper parameter order.
 	 *
 	 *         NOTE: it depends on the transition function how the object should be structured and which parameters are actually used to influence the transition.
 	 * @public
@@ -923,15 +923,15 @@ sap.ui.define([
 	 *
 	 * Calling this navigation method triggers first the (cancelable) "navigate" event on the NavContainer, then the "BeforeHide" pseudo event on the source page and "BeforeFirstShow" (if applicable) and "BeforeShow" on the target page. Later - after the transition has completed - the "AfterShow" pseudo event is triggered on the target page and "AfterHide" on the page which has been left. The given backData object is available in the "BeforeFirstShow", "BeforeShow" and "AfterShow" event object as "data" property.
 	 *
-	 * @param {object} [backData]
+	 * @param {object} [backData={}]
 	 *         This optional object can carry any payload data which should be made available to the target page of the "backToTop" navigation. The event on the target page will contain this data object as "backData" property.
 	 *
-	 *         When the "transitionParameters" object is used, this "data" object must also be given (either as object or as null) in order to have a proper parameter order.
-	 * @param {object} [oTransitionParameters]
+	 *         When the <code>oTransitionParameters</code> parameter is used, this <code>backData</code> parameter must also be given (either as object or as <code>null</code> or <code>undefined</code>) in order to have a proper parameter order.
+	 * @param {object} [oTransitionParameters={}]
 	 *         This optional object can give additional information to the transition function, like the DOM element which triggered the transition or the desired transition duration.
 	 *         The animation type can NOT be selected here - it is always the inverse of the "to" navigation.
 	 *
-	 *         In order to use the "transitionParameters" property, the "data" property must be used (at least "null" must be given) for a proper parameter order.
+	 *         In order to use the <code>oTransitionParameters<code> parameter, the <code>backData</code> parameter must be used (at least <code>null</code> or <code>undefined</code> must be given) for a proper parameter order.
 	 *
 	 *         NOTE: it depends on the transition function how the object should be structured and which parameters are actually used to influence the transition.
 	 * @type this

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.98.0
+	 * @version 1.101.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.98.0
+	 * @version 1.101.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.98.0
+		 * @version 1.101.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/NotificationListGroup.js

@@ -66,7 +66,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.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) {
 

package/src/sap/m/NotificationListItem.js

@@ -66,7 +66,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.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.98.0
+	 * @version 1.101.0
 	 * @since 1.34
 	 *
 	 * @public
@@ -123,43 +123,43 @@ sap.ui.define([
 				/**
 				 * If set to true, the change of the value will be animated.
 				 */
-				"animateTextChange": {type: "boolean", group: "Behavior", defaultValue: true},
+				"animateTextChange": { type: "boolean", group: "Behavior", defaultValue: true },
 
 				/**
 				 * If set to true, the value parameter contains a numeric value and scale. If set to false (default), the value parameter contains a numeric value only.
 				 */
-				"formatterValue": {type: "boolean", group: "Data", defaultValue: false},
+				"formatterValue": { type: "boolean", group: "Data", defaultValue: false },
 
 				/**
 				 * The icon to be displayed as a graphical element within the control. This can be an image or an icon from the icon font.
 				 */
-				"icon": {type: "sap.ui.core.URI", group: "Appearance", defaultValue: null},
+				"icon": { type: "sap.ui.core.URI", group: "Appearance", defaultValue: null },
 
 				/**
 				 * Description of an icon that is used in the tooltip.
 				 */
-				"iconDescription": {type: "string", group: "Accessibility", defaultValue: null},
+				"iconDescription": { type: "string", group: "Accessibility", defaultValue: null },
 
 				/**
 				 * The indicator arrow that shows value deviation.
 				 */
-				"indicator": {type: "sap.m.DeviationIndicator", group: "Appearance", defaultValue: "None"},
+				"indicator": { type: "sap.m.DeviationIndicator", group: "Appearance", defaultValue: "None" },
 
 				/**
 				 * If set to true, the omitted value property is set to 0.
 				 */
-				"nullifyValue": {type: "boolean", group: "Behavior", defaultValue: true},
+				"nullifyValue": { type: "boolean", group: "Behavior", defaultValue: true },
 
 				/**
 				 * The scaling prefix. Financial characters can be used for currencies and counters. The SI prefixes can be used for units. If the scaling prefix contains more than three characters, only the first three characters are displayed.
 				 */
-				"scale": {type: "string", group: "Appearance", defaultValue: null},
+				"scale": { type: "string", group: "Appearance", defaultValue: null },
 
 				/**
 				 * Updates the size of the control. If not set, then the default size is applied based on the device tile.
 				 * @deprecated Since version 1.38.0. The NumericContent control has now a fixed size, depending on the used media (desktop, tablet or phone).
 				 */
-				"size": {type: "sap.m.Size", group: "Appearance", defaultValue: "Auto", deprecated: true},
+				"size": { type: "sap.m.Size", group: "Appearance", defaultValue: "Auto", deprecated: true },
 
 				/**
 				 * The number of characters of the <code>value</code> property to display.
@@ -167,32 +167,32 @@ sap.ui.define([
 				 * <b>Note</b> If <code>adaptiveFontSize</code> is set to <code>true</code> the default value of this property will vary between languages.
 				 * If <code>adaptiveFontSize</code> is set to <code>false</code> the default value of this property is <code>4</code>.
 				 */
-				"truncateValueTo": {type: "int", group: "Appearance"},
+				"truncateValueTo": { type: "int", group: "Appearance" },
 
 				/**
 				 * The actual value.
 				 */
-				"value": {type: "string", group: "Data", defaultValue: null},
+				"value": { type: "string", group: "Data", defaultValue: null },
 
 				/**
 				 * The semantic color of the value.
 				 */
-				"valueColor": {type: "sap.m.ValueColor", group: "Appearance", defaultValue: "Neutral"},
+				"valueColor": { type: "sap.m.ValueColor", group: "Appearance", defaultValue: "Neutral" },
 
 				/**
 				 * The width of the control. If it is not set, the size of the control is defined by the 'size' property.
 				 */
-				"width": {type: "sap.ui.core.CSSSize", group: "Appearance", defaultValue: null},
+				"width": { type: "sap.ui.core.CSSSize", group: "Appearance", defaultValue: null },
 
 				/**
 				 * If the value is set to false, the content is adjusted to the whole size of the control.
 				 */
-				"withMargin": {type: "boolean", group: "Appearance", defaultValue: true},
+				"withMargin": { type: "boolean", group: "Appearance", defaultValue: true },
 
 				/**
 				 * Indicates the load status.
 				 */
-				"state": {type: "sap.m.LoadState", group: "Behavior", defaultValue: "Loaded"},
+				"state": { type: "sap.m.LoadState", group: "Behavior", defaultValue: "Loaded" },
 
 				/**
 				 * If set to its default value true this property applies the appropriate font style class based on the language. When set to false the font size will always be large
@@ -200,7 +200,7 @@ sap.ui.define([
 				 * @experimental As of version 1.73 Disclaimer: this property is in a beta state - incompatible API changes may be done before its official public release. Use at your own discretion.
 				 * @since 1.73
 				 */
-				"adaptiveFontSize": {type: "boolean", group: "Appearance", defaultValue: true}
+				"adaptiveFontSize": { type: "boolean", group: "Appearance", defaultValue: true }
 
 
 			},
@@ -236,8 +236,8 @@ sap.ui.define([
 
 	NumericContent.prototype._getMaxDigitsData = function () {
 		var sFontClass = null,
-		  sLang = sap.ui.getCore().getConfiguration().getLanguage().toLowerCase(),
-		  iMaxLength = LANG_MAP[sLang] || 4;
+			sLang = sap.ui.getCore().getConfiguration().getLanguage().toLowerCase(),
+			iMaxLength = LANG_MAP[sLang] || 4;
 
 		if (this.getAdaptiveFontSize()) {
 			switch (iMaxLength) {
@@ -300,7 +300,7 @@ sap.ui.define([
 	 * Shows/hides icon depending if it fits or not.
 	 * @private
 	 */
-	NumericContent.prototype._checkIfIconFits = function() {
+	NumericContent.prototype._checkIfIconFits = function () {
 		//first check if parent tile is going to resize in the future so resize it now for our calculation
 		var oParentTile = this._getParentTile();
 		if (oParentTile && (oParentTile.isA("sap.m.GenericTile") || oParentTile.isA("sap.m.SlideTile"))) {
@@ -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();
@@ -505,9 +505,17 @@ sap.ui.define([
 		// remove the invisible unicode character LTR and RTL mark before processing the regular expression.
 		var sTrimmedValue = sValue.replace(String.fromCharCode(8206), "").replace(String.fromCharCode(8207), "");
 
+		// extract value and scale information from string using regex.
+		var aValueMatches = sTrimmedValue.match(/([+-., \d]*)/g) || [];
+		var aScaleMatches = sTrimmedValue.match(/[^+-., \d]/g) || [];
+
 		return {
-			scale: sTrimmedValue.replace(/[+-., \d]*(.*)$/g, "$1").trim().replace(/\.$/, ""),
-			value: sTrimmedValue.replace(/([+-., \d]*).*$/g, "$1").trim()
+			value: aValueMatches.reduce(function (acc, curVal){
+						return acc + curVal;
+					}, '').trim(),
+			scale: aScaleMatches.reduce(function (acc, curVal){
+						return acc + curVal;
+					}, '').trim()
 		};
 	};
 

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.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @private
@@ -48,7 +48,8 @@ function(
 	var NumericInput = Input.extend("sap.m.NumericInput", {
 		metadata: {
 			library: "sap.m"
-		}
+		},
+		renderer: NumericInputRenderer
 	});
 
 	NumericInput.prototype.onBeforeRendering = function() {

package/src/sap/m/NumericInputRenderer.js

@@ -41,6 +41,18 @@ sap.ui.define(["sap/ui/core/Renderer", "./InputRenderer", "sap/ui/Device", "sap/
 		}
 	};
 
+	/**
+	 * Returns aria accessibility role for the control.
+	 *
+	 * @protected
+	 * @override
+	 * @param {sap.m.Input} oControl An object representation of the control
+	 * @returns {string}
+	 */
+	 NumericInputRenderer.getAriaRole = function (oControl) {
+		return "spinbutton";
+	};
+
 	//Accessibility behavior of the Input needs to be extended
 	/**
 	* Overwrites the accessibility state using the <code>getAccessibilityState</code> method of the <code>InputBaseRenderer</code>.
@@ -49,7 +61,7 @@ sap.ui.define(["sap/ui/core/Renderer", "./InputRenderer", "sap/ui/Device", "sap/
 	* @returns {Array} mAccessibilityState
 	*/
 	NumericInputRenderer.getAccessibilityState = function(oNumericInput) {
-		var mAccessibilityState = InputRenderer.getAccessibilityState(oNumericInput),
+		var mAccessibilityState = InputRenderer.getAccessibilityState.apply(this, arguments),
 			fMin,
 			fMax,
 			fNow,