@openui5/sap.ui.core 1.120.34 → 1.120.36

package/src/sap/ui/core/format/NumberFormat.js

@@ -47,17 +47,22 @@ sap.ui.define([
 		}
 	});
 
-	var rAllWhiteSpaces = /\s/g,
-		rDigit = /\d/,
-		// Regex for checking if a number has leading zeros
-		rLeadingZeros = /^(-?)0+(\d)/,
-		// Not matching Sc (currency symbol) and Z (separator) characters
-		// https://www.unicode.org/reports/tr44/#General_Category_Values
-		rNotSAndNotZ = /[^\$\xA2-\xA5\u058F\u060B\u09F2\u09F3\u09FB\u0AF1\u0BF9\u0E3F\u17DB\u20A0-\u20BD\uA838\uFDFC\uFE69\uFF04\uFFE0\uFFE1\uFFE5\uFFE6\u0020\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000]/,
-		// Regex for matching the number placeholder in pattern
-		rNumPlaceHolder = /0+(\.0+)?/,
-		// Regex for checking that the given string only consists of '0' characters
-		rOnlyZeros = /^0+$/;
+	const rAllWhiteSpaces = /\s/g;
+	const rDigit = /\d/;
+	// Regex for checking if a number has leading zeros
+	const rLeadingZeros = /^(-?)0+(\d)/;
+	// Not matching Sc (currency symbol) and Z (separator) characters
+	// https://www.unicode.org/reports/tr44/#General_Category_Values
+	const rNotSAndNotZ = /[^\$\xA2-\xA5\u058F\u060B\u09F2\u09F3\u09FB\u0AF1\u0BF9\u0E3F\u17DB\u20A0-\u20BD\uA838\uFDFC\uFE69\uFF04\uFFE0\uFFE1\uFFE5\uFFE6\u0020\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000]/;
+	// Regex for matching the number placeholder in pattern
+	const rNumPlaceHolder = /0+(\.0+)?/;
+	// Regex for checking that the given string only consists of '0' characters
+	const rOnlyZeros = /^0+$/;
+	// A regular expresssion that can be used to remove a leading "-" from a number representing zero,
+	// e.g. "-0", or "-0.00"; $1 contains the number without the leading "-"
+	const rRemoveMinusFromZero = /^-(0(?:.0+)?)$/;
+	// A regular expression that can be used to remove trailing zeros from a number
+	const rTrailingZeros = /0+$/;
 
 	/*
 	 * Is used to validate existing grouping separators.
@@ -166,25 +171,154 @@ sap.ui.define([
 		return decimals;
 	};
 
-	var mRoundingFunction = {};
-	mRoundingFunction[mRoundingMode.FLOOR] = Math.floor;
-	mRoundingFunction[mRoundingMode.CEILING] = Math.ceil;
-	mRoundingFunction[mRoundingMode.TOWARDS_ZERO] = function(nValue) {
-		return nValue > 0 ? Math.floor(nValue) : Math.ceil(nValue);
-	};
-	mRoundingFunction[mRoundingMode.AWAY_FROM_ZERO] = function(nValue) {
-		return nValue > 0 ? Math.ceil(nValue) : Math.floor(nValue);
-	};
-	mRoundingFunction[mRoundingMode.HALF_TOWARDS_ZERO] = function(nValue) {
-		return nValue > 0 ? Math.ceil(nValue - 0.5) : Math.floor(nValue + 0.5);
-	};
-	mRoundingFunction[mRoundingMode.HALF_AWAY_FROM_ZERO] = function(nValue) {
-		return nValue > 0 ? Math.floor(nValue + 0.5) : Math.ceil(nValue - 0.5);
+	/**
+	 * Adds the summand given as a number to an decimal given as a string.
+	 *
+	 * @param {string} sDecimal A positive or negative decimal number as string
+	 * @param {int} iSummand An integer between -9 and 9 to be added to the given decimal number
+	 * @returns {string} The sum of the two numbers as a string
+	 *
+	 * @private
+	 */
+	NumberFormat.add = function (sDecimal, iSummand) {
+		const aParts = sDecimal.split(".");
+		let sInteger = aParts[0];
+		const sFractionPart = aParts[1];
+		const bNegative = sInteger[0] === "-";
+		if (bNegative) {
+			sInteger = sInteger.slice(1);
+			iSummand = -iSummand;
+		}
+		const aDigits = sInteger.split("").map(Number);
+		const iLastIndex = aDigits.length - 1;
+		aDigits[iLastIndex] += iSummand;
+		for (let i = iLastIndex; i >= 0; i -= 1) {
+			if (aDigits[i] >= 10) {
+				aDigits[i] = aDigits[i] % 10;
+				if (i === 0) {
+					aDigits.unshift(1);
+					break;
+				}
+				aDigits[i - 1] += 1;
+			} else if (aDigits[i] < 0 && i > 0) {
+				aDigits[i] = 10 + aDigits[i];
+				aDigits[i - 1] -= 1;
+				if (i === 1 && aDigits[0] === 0) {
+					aDigits.shift();
+					break;
+				}
+			} else {
+				break;
+			}
+		}
+		if (bNegative) {
+			aDigits[0] = -aDigits[0];
+		}
+		let sResult = aDigits.join("");
+		if (!sFractionPart) {
+			return sResult;
+		}
+
+		// If sResult is 0, the sign may be lost and has to be restored, e.g. "-5.123" + 5 => -5 + 5 = 0 => "-0.123"
+		sResult = sResult === "0" && bNegative ? "-0" : sResult;
+		const sResultSign = sResult[0] === "-" ? "-" : "";
+		// If both signs are equal, the fraction part can simply be appended
+		if (bNegative === !!sResultSign) {
+			return sResult + "." + sFractionPart;
+		}
+
+		// If the signs are different, aDigits contains only one digit which is different from zero; to compute the
+		// result, the result sign has to be kept, the integer part is the absolute sResult reduced by one, and the
+		// fractional part is (1 - fractional part), e.g. "2.123" - 5 => 2 - 5 = -3 => sign = "-", integer part is
+		// |-3| - 1 = 2 and fractional part is 1 - 0.123 = 0.877 without the leading "0." => "-2.877"
+		const aFractionDigits = sFractionPart.split("").map(Number);
+		for (let i = aFractionDigits.length - 1; i >= 0; i -= 1) {
+			aFractionDigits[i] = 10 - aFractionDigits[i];
+			if (i > 0) {
+				aFractionDigits[i - 1] += 1;
+			}
+		}
+		return sResultSign + (Math.abs(aDigits[0]) - 1) + "." + aFractionDigits.join("");
 	};
-	mRoundingFunction[mRoundingMode.HALF_FLOOR] = function(nValue) {
-		return Math.ceil(nValue - 0.5);
+
+	/**
+	 * Rounds the given number up to the smallest integer greater than or equal to the given number.
+	 *
+	 * @param {number|string} vNumber
+	 *   The number to be rounded up; it has at least one digit in front of the decimal point in case of type "string"
+	 * @returns {number|string}
+	 *   The smallest integer greater than or equal to the given number; the returned type is the same as the type of
+	 *   the given number
+	 */
+	function ceil(vNumber) {
+		if (typeof vNumber === "number") {
+			return Math.ceil(vNumber);
+		}
+
+		const [sIntegerPart, sFractionPart = "0"] = vNumber.split(".");
+		return rOnlyZeros.test(sFractionPart) || sIntegerPart[0] === "-"
+			? sIntegerPart
+			: NumberFormat.add(sIntegerPart, 1);
+	}
+
+	/**
+	 * Rounds the given number down to the largest integer less than or equal to the given number.
+	 *
+	 * @param {number|string} vNumber
+	 *   The number to be rounded down; it has at least one digit in front of the decimal point in case of type "string"
+	 * @returns {number|string}
+	 *   The largest integer less than or equal to the given number; the returned type is the same as the type of the
+	 *   given number
+	 */
+	function floor(vNumber) {
+		if (typeof vNumber === "number") {
+			return Math.floor(vNumber);
+		}
+
+		const [sIntegerPart, sFractionPart = "0"] = vNumber.split(".");
+		return rOnlyZeros.test(sFractionPart) || sIntegerPart[0] !== "-"
+			? sIntegerPart
+			: NumberFormat.add(sIntegerPart, -1);
+	}
+
+	/**
+	 * Adds 0.5 to or subtracts 0.5 from the given number.
+	 *
+	 * @param {number|string} vNumber
+	 *   The number to be increased or decreased by 0.5
+	 * @param {boolean} bIncrease
+	 *   Whether to increase the number by 0.5; otherwise the number is decreased by 0.5
+	 * @returns {number|string}
+	 *   The number increased or decreased by 0.5; the returned type is the same as the type of the given number
+	 */
+	function increaseOrDecreaseByHalf(vNumber, bIncrease) {
+		if (typeof vNumber === "number") {
+			return bIncrease ? vNumber + 0.5 : vNumber - 0.5;
+		}
+
+		vNumber = NumberFormat._shiftDecimalPoint(vNumber, 1);
+		vNumber = NumberFormat.add(vNumber, bIncrease ? 5 : -5);
+		return NumberFormat._shiftDecimalPoint(vNumber, -1);
+	}
+
+	const mRoundingFunction = {
+		[mRoundingMode.FLOOR]: floor,
+		[mRoundingMode.CEILING]: ceil,
+		[mRoundingMode.TOWARDS_ZERO]: (vNumber) => (vNumber > 0 ? floor(vNumber) : ceil(vNumber)),
+		[mRoundingMode.AWAY_FROM_ZERO]: (vNumber) => (vNumber > 0 ? ceil(vNumber) : floor(vNumber)),
+		[mRoundingMode.HALF_TOWARDS_ZERO]: (vNumber) => {
+			const bPositive = vNumber > 0;
+			vNumber = increaseOrDecreaseByHalf(vNumber, !bPositive);
+			return bPositive ? ceil(vNumber) : floor(vNumber);
+		},
+		[mRoundingMode.HALF_AWAY_FROM_ZERO]: (vNumber) => {
+			const bPositive = vNumber > 0;
+			vNumber = increaseOrDecreaseByHalf(vNumber, bPositive);
+			return bPositive ? floor(vNumber) : ceil(vNumber);
+		},
+		[mRoundingMode.HALF_FLOOR]: (vNumber) => ceil(increaseOrDecreaseByHalf(vNumber, false)),
+		[mRoundingMode.HALF_CEILING]: (vNumber) => floor(increaseOrDecreaseByHalf(vNumber, true))
 	};
-	mRoundingFunction[mRoundingMode.HALF_CEILING] = Math.round;
 
 	NumberFormat.RoundingMode = mRoundingMode;
 
@@ -410,12 +544,14 @@ sap.ui.define([
 	 *   <code>maxFractionDigits</code> format option allows.
 	 *   If decimals are not preserved, the formatted number is rounded to <code>maxFractionDigits</code>.
 	 * @param {sap.ui.core.format.NumberFormat.RoundingMode} [oFormatOptions.roundingMode=HALF_AWAY_FROM_ZERO]
-	 *   specifies the rounding behavior for discarding the digits after the maximum fraction digits
-	 *   defined by maxFractionDigits. Rounding will only be applied if the passed value is of type <code>number</code>.
+	 *   Specifies the rounding behavior for discarding the digits after the maximum fraction digits
+	 *   defined by <code>maxFractionDigits</code>.
 	 *   This can be assigned
 	 *   <ul>
 	 *     <li>by value in {@link sap.ui.core.format.NumberFormat.RoundingMode RoundingMode},</li>
-	 *     <li>via a function that is used for rounding the number and takes two parameters: the number itself, and the number of decimal digits that should be reserved.</li>
+	 *     <li>via a function that is used for rounding the number and takes two parameters: the number itself, and the
+	 *         number of decimal digits that should be reserved. <b>Using a function is deprecated since 1.120</b>;
+	 *         string based numbers are not rounded via this custom function.</li>
 	 *   </ul>
 	 * @param {int} [oFormatOptions.shortDecimals] defines the number of decimal in the shortened format string. If this isn't specified, the 'decimals' options is used
 	 * @param {int} [oFormatOptions.shortLimit] only use short number formatting for values above this limit
@@ -508,12 +644,14 @@ sap.ui.define([
 	 *   <code>maxFractionDigits</code> format option allows.
 	 *   If decimals are not preserved, the formatted number is rounded to <code>maxFractionDigits</code>.
 	 * @param {sap.ui.core.format.NumberFormat.RoundingMode} [oFormatOptions.roundingMode=TOWARDS_ZERO]
-	 *   specifies the rounding behavior for discarding the digits after the maximum fraction digits
-	 *   defined by maxFractionDigits. Rounding will only be applied if the passed value is of type <code>number</code>.
+	 *   Specifies the rounding behavior for discarding the digits after the maximum fraction digits
+	 *   defined by <code>maxFractionDigits</code>.
 	 *   This can be assigned
 	 *   <ul>
 	 *     <li>by value in {@link sap.ui.core.format.NumberFormat.RoundingMode RoundingMode},</li>
-	 *     <li>via a function that is used for rounding the number and takes two parameters: the number itself, and the number of decimal digits that should be reserved.</li>
+	 *     <li>via a function that is used for rounding the number and takes two parameters: the number itself, and the
+	 *         number of decimal digits that should be reserved. <b>Using a function is deprecated since 1.120</b>;
+	 *         string based numbers are not rounded via this custom function.</li>
 	 *   </ul>
 	 * @param {int} [oFormatOptions.shortDecimals] defines the number of decimal in the shortened format string. If this isn't specified, the 'decimals' options is used
 	 * @param {int} [oFormatOptions.shortLimit] only use short number formatting for values above this limit
@@ -647,12 +785,14 @@ sap.ui.define([
 	 *   <code>maxFractionDigits</code> format option allows.
 	 *   If decimals are not preserved, the formatted number is rounded to <code>maxFractionDigits</code>.
 	 * @param {sap.ui.core.format.NumberFormat.RoundingMode} [oFormatOptions.roundingMode=HALF_AWAY_FROM_ZERO]
-	 *   specifies the rounding behavior for discarding the digits after the maximum fraction digits
-	 *   defined by maxFractionDigits. Rounding will only be applied if the passed value is of type <code>number</code>.
+	 *   Specifies the rounding behavior for discarding the digits after the maximum fraction digits
+	 *   defined by <code>maxFractionDigits</code>.
 	 *   This can be assigned
 	 *   <ul>
 	 *     <li>by value in {@link sap.ui.core.format.NumberFormat.RoundingMode RoundingMode},</li>
-	 *     <li>via a function that is used for rounding the number and takes two parameters: the number itself, and the number of decimal digits that should be reserved.</li>
+	 *     <li>via a function that is used for rounding the number and takes two parameters: the number itself, and the
+	 *         number of decimal digits that should be reserved. <b>Using a function is deprecated since 1.120</b>;
+	 *         string based numbers are not rounded via this custom function.</li>
 	 *   </ul>
 	 * @param {int} [oFormatOptions.shortDecimals] defines the number of decimal in the shortened format string. If this isn't specified, the 'decimals' options is used
 	 * @param {int} [oFormatOptions.shortLimit] only use short number formatting for values above this limit
@@ -781,12 +921,14 @@ sap.ui.define([
 	 *   <code>maxFractionDigits</code> format option allows.
 	 *   If decimals are not preserved, the formatted number is rounded to <code>maxFractionDigits</code>.
 	 * @param {sap.ui.core.format.NumberFormat.RoundingMode} [oFormatOptions.roundingMode=HALF_AWAY_FROM_ZERO]
-	 *   specifies the rounding behavior for discarding the digits after the maximum fraction digits
-	 *   defined by maxFractionDigits. Rounding will only be applied if the passed value is of type <code>number</code>.
+	 *   Specifies the rounding behavior for discarding the digits after the maximum fraction digits
+	 *   defined by <code>maxFractionDigits</code>.
 	 *   This can be assigned
 	 *   <ul>
 	 *     <li>by value in {@link sap.ui.core.format.NumberFormat.RoundingMode RoundingMode},</li>
-	 *     <li>via a function that is used for rounding the number and takes two parameters: the number itself, and the number of decimal digits that should be reserved.</li>
+	 *     <li>via a function that is used for rounding the number and takes two parameters: the number itself, and the
+	 *         number of decimal digits that should be reserved. <b>Using a function is deprecated since 1.120</b>;
+	 *         string based numbers are not rounded via this custom function.</li>
 	 *   </ul>
 	 * @param {int} [oFormatOptions.shortDecimals] defines the number of decimals in the shortened
 	 *   format string. If this option isn't specified, the 'decimals' option is used instead.
@@ -884,12 +1026,14 @@ sap.ui.define([
 	 *   <code>maxFractionDigits</code> format option allows.
 	 *   If decimals are not preserved, the formatted number is rounded to <code>maxFractionDigits</code>.
 	 * @param {sap.ui.core.format.NumberFormat.RoundingMode} [oFormatOptions.roundingMode=HALF_AWAY_FROM_ZERO]
-	 *   specifies the rounding behavior for discarding the digits after the maximum fraction digits
-	 *   defined by maxFractionDigits. Rounding will only be applied if the passed value is of type <code>number</code>.
+	 *   Specifies the rounding behavior for discarding the digits after the maximum fraction digits
+	 *   defined by <code>maxFractionDigits</code>.
 	 *   This can be assigned
 	 *   <ul>
 	 *     <li>by value in {@link sap.ui.core.format.NumberFormat.RoundingMode RoundingMode},</li>
-	 *     <li>via a function that is used for rounding the number and takes two parameters: the number itself, and the number of decimal digits that should be reserved.</li>
+	 *     <li>via a function that is used for rounding the number and takes two parameters: the number itself, and the
+	 *         number of decimal digits that should be reserved. <b>Using a function is deprecated since 1.120</b>;
+	 *         string based numbers are not rounded via this custom function.</li>
 	 *   </ul>
 	 * @param {int} [oFormatOptions.shortDecimals] defines the number of decimal in the shortened format string. If this isn't specified, the 'decimals' options is used
 	 * @param {int} [oFormatOptions.shortLimit] only use short number formatting for values above this limit
@@ -1467,7 +1611,8 @@ sap.ui.define([
 		// If the number of fraction digits are equal or less than oOptions.maxFractionDigits, the
 		// number isn't changed. After this operation, the number of fraction digits is
 		// equal or less than oOptions.maxFractionDigits.
-		if (typeof vValue === "number" && !oOptions.preserveDecimals) {
+		if ((typeof vValue === "number" || typeof vValue === "string" && typeof oOptions.roundingMode !== "function")
+				&& !oOptions.preserveDecimals) {
 			vValue = rounding(vValue, oOptions.maxFractionDigits, oOptions.roundingMode);
 		}
 
@@ -2088,10 +2233,22 @@ sap.ui.define([
 		}
 	};
 
-	NumberFormat._shiftDecimalPoint = function(vValue, iStep) {
-		if (typeof iStep !== "number") {
-			return NaN;
-		}
+	/**
+	 * Moves the decimal seperator of the given number by the given steps to the right or left.
+	 *
+	 * @param {number|string} vValue
+	 *   The number
+	 * @param {int} iStep
+	 *   The number of decimal places to shift the "."; positive values shift to the right, negative values shift to the
+	 *   left
+	 * @param {boolean} bNormalize
+	 *   Whether the result is normalized if <code>vValue</code> is of type "string"; that means whether trailing zeros
+	 *   are removed and whether scientific notation is resolved to a decimal string without exponent
+	 * @returns {number|string|null}
+	 *   The number with shifted decimal point; or <code>null</code> if the given value is neither of type "number", nor
+	 *   of type "string"
+	 */
+	NumberFormat._shiftDecimalPoint = function(vValue, iStep, bNormalize) {
 		var sMinus = "";
 		var aExpParts = vValue.toString().toLowerCase().split("e");
 
@@ -2104,7 +2261,7 @@ sap.ui.define([
 
 			return +(aExpParts[0] + "e" + iStep);
 		} else if (typeof vValue === "string") {
-			if (parseFloat(vValue) === 0 && iStep >= 0) {
+			if (!bNormalize && parseFloat(vValue) === 0 && iStep >= 0) {
 				// input "00000" should become "0"
 				// input "000.000" should become "0.000" to keep precision of decimals
 				// input "1e-1337" should remain "1e-1337" in order to keep the precision
@@ -2116,7 +2273,7 @@ sap.ui.define([
 			var sFirstChar = aExpParts[0].charAt(0);
 			sMinus = sFirstChar === "-" ? sFirstChar : "";
 
-			if (sMinus) {
+			if (sMinus || sFirstChar === "+") {
 				aExpParts[0] = aExpParts[0].slice(1);
 			}
 
@@ -2155,9 +2312,11 @@ sap.ui.define([
 
 			sInt = vValue.substring(0, iAfterMovePos);
 			sDecimal = vValue.substring(iAfterMovePos);
-
 			// remove unnecessary leading zeros
 			sInt = sInt.replace(rLeadingZeros, "$1$2");
+			if (bNormalize) {
+				sDecimal = sDecimal.replace(rTrailingZeros, "");
+			}
 
 			return sMinus + sInt + (sDecimal ? ("." + sDecimal) : "");
 		} else {
@@ -2640,54 +2799,63 @@ sap.ui.define([
 		return iInt;
 	}
 
-	function rounding(fValue, iMaxFractionDigits, sRoundingMode) {
-		if (typeof fValue !== "number") {
-			return NaN;
-		}
-
-		sRoundingMode = sRoundingMode || NumberFormat.RoundingMode.HALF_AWAY_FROM_ZERO;
+	/**
+	 * Rounds the given value by the given number of fraction digits based on the given rounding mode.
+	 *
+	 * @param {number|string} vValue
+	 *   The number to be rounded, may be a string or a number; has to be of type number if a custom rounding function
+	 *   is used
+	 * @param {int|string} iMaxFractionDigits
+	 *   The maximum number of fraction digits
+	 * @param {sap.ui.core.format.NumberFormat.RoundingMode|function(number,int):number} vRoundingMode
+	 *   The rounding mode or a custom function for rounding which is called with the number and the number of decimal
+	 *   digits that should be reserved; <b>using a function is deprecated since 1.120</b>; string based numbers are
+	 *   not rounded via this custom function.
+	 * @returns {number|string}
+	 *   The rounded value; the returned type is the same as the type of the given <code>vValue</code>
+	 */
+	function rounding(vValue, iMaxFractionDigits, vRoundingMode) {
+		vRoundingMode = vRoundingMode || NumberFormat.RoundingMode.HALF_AWAY_FROM_ZERO;
 		iMaxFractionDigits = parseInt(iMaxFractionDigits);
 
 		// only round if it is required (number of fraction digits is bigger than the maxFractionDigits option)
-		var sValue = "" + fValue;
+		var sValue = "" + vValue;
 		if (!isScientificNotation(sValue)) {
 			var iIndexOfPoint = sValue.indexOf(".");
 			if (iIndexOfPoint < 0) {
-				return fValue;
+				return vValue;
 			}
 			if (sValue.substring(iIndexOfPoint + 1).length <= iMaxFractionDigits) {
-				return fValue;
+				if (typeof vValue === "string") {
+					vValue = NumberFormat._shiftDecimalPoint(vValue, 0, true);
+				}
+				return vValue;
 			}
 		}
 
-		if (typeof sRoundingMode === "function") {
+		if (typeof vRoundingMode === "function") {
 			// Support custom function for rounding the number
-			fValue = sRoundingMode(fValue, iMaxFractionDigits);
+			vValue = vRoundingMode(vValue, iMaxFractionDigits);
 		} else {
 			// The NumberFormat.RoundingMode had all values in lower case before and later changed all values to upper case
 			// to match the key according to the UI5 guideline for defining enum. Therefore it's needed to support both
 			// lower and upper cases. Here checks whether the value has only lower case letters and converts it all to upper
 			// case if so.
-			if (sRoundingMode.match(/^[a-z_]+$/)) {
-				sRoundingMode = sRoundingMode.toUpperCase();
+			if (vRoundingMode.match(/^[a-z_]+$/)) {
+				vRoundingMode = vRoundingMode.toUpperCase();
 			}
 
-			if (!iMaxFractionDigits) {
-				return mRoundingFunction[sRoundingMode](fValue);
+			// 1. Move the decimal point to right by maxFactionDigits; e.g. 1.005 with maxFractionDigits 2 => 100.5
+			vValue = NumberFormat._shiftDecimalPoint(vValue, iMaxFractionDigits, true);
+			// 2. Use the rounding function to round the first digit after decimal point; e.g. ceil(100.5) => 101
+			vValue = mRoundingFunction[vRoundingMode](vValue);
+			// 3. Finally move the decimal point back to the original position; e.g. by 2 digits => 1.01
+			vValue = NumberFormat._shiftDecimalPoint(vValue, -iMaxFractionDigits, true);
+			if (typeof vValue === "string") {
+				vValue = vValue.replace(rRemoveMinusFromZero, "$1");
 			}
-
-			// First move the decimal point towards right by maxFactionDigits
-			// Then using the rounding function to round the first digit after decimal point
-			// In the end, move the decimal point back to the original position
-			//
-			// For example rounding 1.005 by maxFractionDigits 2
-			// 	1. Move the decimal point to right by 2 digits, result 100.5
-			// 	2. Using the round function, for example, Math.round(100.5) = 101
-			// 	3. Move the decimal point back by 2 digits, result 1.01
-			fValue = NumberFormat._shiftDecimalPoint(mRoundingFunction[sRoundingMode](NumberFormat._shiftDecimalPoint(fValue, iMaxFractionDigits)), -iMaxFractionDigits);
 		}
-
-		return fValue;
+		return vValue;
 	}
 
 	function quote(sRegex) {

package/src/sap/ui/core/format/TimezoneUtil.js

@@ -13,7 +13,7 @@ sap.ui.define([
 	 * Static collection of utility functions to handle time zone related conversions
 	 *
 	 * @author SAP SE
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 * @namespace
 	 * @name module:sap/ui/core/format/TimezoneUtils
 	 * @private

package/src/sap/ui/core/getCompatibilityVersion.js

@@ -16,7 +16,7 @@ sap.ui.define([
 
 	const BASE_CVERS = Version("1.14");
 
-	const VERSION = "1.120.34";
+	const VERSION = "1.120.36";
 
 	var M_COMPAT_FEATURES = {
 		"xx-test"               : "1.15", //for testing purposes only

package/src/sap/ui/core/hyphenation/Hyphenation.js

@@ -400,7 +400,7 @@ sap.ui.define([
 	 * @see {@link topic:6322164936f047de941ec522b95d7b70 Hyphenation for Text Controls}
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 * @hideconstructor
 	 * @public
 	 * @since 1.60

package/src/sap/ui/core/library.js

@@ -26,13 +26,13 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.core
 	 * @author SAP SE
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 * @since 0.8
 	 * @public
 	 */
 	 var thisLib = Library.init({
 		 name: "sap.ui.core",
-		 version: "1.120.34",
+		 version: "1.120.36",
 		 designtime: "sap/ui/core/designtime/library.designtime",
 		 // "apiVersion" is still WIP and in 1.120 restricted to the sap.ui.core library only!
 		 // TODO: Remove spread operator once UI5 Tooling can validate this new property
@@ -1630,7 +1630,7 @@ sap.ui.define([
 	/**
 	 * Sort order of a column.
 	 *
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 * @enum {string}
 	 * @public
 	 * @since 1.61.0

package/src/sap/ui/core/message/ControlMessageProcessor.js

@@ -29,7 +29,7 @@ sap.ui.define(['sap/ui/core/Element', 'sap/ui/core/message/MessageProcessor'],
 	 * @extends sap.ui.core.message.MessageProcessor
 	 *
 	 * @author SAP SE
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 *
 	 * @public
 	 * @alias sap.ui.core.message.ControlMessageProcessor

package/src/sap/ui/core/message/Message.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 *
 	 * @param {object} [mParameters] a map which contains the following parameter properties:
 	 * @param {string} [mParameters.id] The message id: will be generated if no id is set

package/src/sap/ui/core/message/MessageManager.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 *
 	 * @public
 	 * @alias sap.ui.core.message.MessageManager

package/src/sap/ui/core/message/MessageParser.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/Log"],
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 * @public
 	 * @abstract
 	 * @alias sap.ui.core.message.MessageParser

package/src/sap/ui/core/message/MessageProcessor.js

@@ -27,7 +27,7 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/util/uid"],
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 *
 	 * @public
 	 * @alias sap.ui.core.message.MessageProcessor

package/src/sap/ui/core/messagebundle_fi.properties

@@ -2,7 +2,7 @@
 SAPUI5_FRIDAY=Friday
 SAPUI5_GM_ZSTEP=Zoom step {0}
 
-VALUE_STATE_ERROR=Virheellinen sy\u00F6tt\u00F6
+VALUE_STATE_ERROR=Virheellinen sy\u00F6tt\u00F6'
 VALUE_STATE_WARNING=Varoitus tulostettu
 VALUE_STATE_SUCCESS=Merkinn\u00E4n validointi onnistui
 VALUE_STATE_INFORMATION=Informatiivinen merkint\u00E4

package/src/sap/ui/core/mvc/HTMLView.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.mvc.View
 	 *
 	 * @author SAP SE
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 *
 	 * @public
 	 * @since 1.9.2

package/src/sap/ui/core/mvc/JSONView.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @class
 	 * A View defined using JSON.
 	 * @extends sap.ui.core.mvc.View
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 *
 	 * @public
 	 * @alias sap.ui.core.mvc.JSONView

package/src/sap/ui/core/mvc/JSView.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 *
 	 * @extends sap.ui.core.mvc.View
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 * @deprecated Since 1.90. Instead use {@link topic:e6bb33d076dc4f23be50c082c271b9f0 Typed Views}
 	 * by defining the view class with {@link sap.ui.core.mvc.View.extend View.extend} and
 	 * creating the view instances with {@link sap.ui.core.mvc.View.create View.create}.

package/src/sap/ui/core/mvc/TemplateView.js

@@ -29,7 +29,7 @@ function(View, TemplateViewRenderer, ViewType, Log) {
 	 * @extends sap.ui.core.mvc.View
 	 *
 	 * @author SAP SE
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 *
 	 * @public
 	 * @deprecated Since version 1.56.0, use {@link sap.ui.core.mvc.XMLView} in combination with

package/src/sap/ui/core/mvc/View.js

@@ -142,7 +142,7 @@ sap.ui.define([
 	 * The default implementation of this method returns <code>false</code>.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 *
 	 * @public
 	 * @alias sap.ui.core.mvc.View

package/src/sap/ui/core/mvc/XMLView.js

@@ -110,7 +110,7 @@ sap.ui.define([
 	 * bound content aggregation. An error will be thrown when the above combination is detected.
 	 *
 	 * @extends sap.ui.core.mvc.View
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 *
 	 * @public
 	 * @alias sap.ui.core.mvc.XMLView

package/src/sap/ui/core/plugin/DeclarativeSupport.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @see sap.ui.core.DeclarativeSupport
 	 * @public
 	 * @since 1.7.0
-	 * @version 1.120.34
+	 * @version 1.120.36
 	 * @alias sap.ui.core.plugin.DeclarativeSupport
 	 * @deprecated since 1.120
 	 */

package/src/sap/ui/core/plugin/LessSupport.js

@@ -44,7 +44,7 @@
 			 *        feature - DO NOT USE IN PRODUCTIVE SCENARIOS!!
 			 *
 			 * @author Peter Muessig
-			 * @version 1.120.34
+			 * @version 1.120.36
 			 * @private
 			 * @alias sap.ui.core.plugin.LessSupport
 			 */