diff --git a/src/ng/filter/filters.js b/src/ng/filter/filters.js index 91cb588aff75..30d3e737c735 100644 --- a/src/ng/filter/filters.js +++ b/src/ng/filter/filters.js @@ -118,6 +118,16 @@ function numberFilter($locale) { }; } +function shiftDecimalPlace(number,fractionSize) { + var numberArray = number.toString().split('e'); + var fractionUsed = +fractionSize; + //If number was already an exponent, adjust the exponent value rather than adding new exponent. + if(numberArray[1]) { + fractionUsed = +numberArray[1] + fractionUsed; + } + return +(numberArray[0] + 'e' + fractionUsed); +} + var DECIMAL_SEP = '.'; function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) { if (number == null || !isFinite(number) || isObject(number)) return ''; @@ -151,7 +161,10 @@ function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) { // safely round numbers in JS without hitting imprecisions of floating-point arithmetics // inspired by: // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round - number = +(Math.round(+(number.toString() + 'e' + fractionSize)).toString() + 'e' + -fractionSize); + number = shiftDecimalPlace(Math.round(shiftDecimalPlace(number,fractionSize)),-fractionSize); + if(isNaN(number)) { + number = shiftDecimalPlace(shiftDecimalPlace(number,-fractionSize),fractionSize); + } var fraction = ('' + number).split(DECIMAL_SEP); var whole = fraction[0]; diff --git a/test/ng/filter/filtersSpec.js b/test/ng/filter/filtersSpec.js index af0cdba6d96d..cc1762923d78 100644 --- a/test/ng/filter/filtersSpec.js +++ b/test/ng/filter/filtersSpec.js @@ -59,6 +59,26 @@ describe('filters', function() { expect(num).toBe('1.1112'); }); + it('should format large number',function() { + pattern.gsize = 2; + var num = formatNumber(12345868059685210000, pattern, ',', '.', 2); + expect(num).toBe('12,345,868,059,685,210,000.00'); + num = formatNumber(79832749837498327498274983793234322432, pattern, ',', '.', 2); + expect(num).toBe('7.983274983749832e+37'); + num = formatNumber(8798327498374983274928, pattern, ',', '.', 2); + expect(num).toBe('8.798327498374983e+21'); + num = formatNumber(879832749374983274928, pattern, ',', '.', 2); + var msie = +((/msie (\d+)/.exec(navigator.userAgent.toLowerCase()) || [])[1]); + var msie11 = (/Trident.*7.0/.exec(navigator.userAgent.toLowerCase())); + if(msie || msie11) { + expect(num).toBe('879,832,749,374,983,100,000.00'); + } else { + expect(num).toBe('879,832,749,374,983,200,000.00'); + } + num = formatNumber(879832749374983274928, pattern, ',', '.', 32); + expect(num).toBe('879,832,749,374,983,200,000.00000000000000000000000000000000'); + }); + it('should format according different separators', function() { var num = formatNumber(1234567.1, pattern, '.', ',', 2); expect(num).toBe('1.234.567,10');