Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit cceb455

Browse files
sagens42caitp
authored andcommitted
fix(numberFilter): convert all non-finite/non-numbers/non-numeric strings to the empty string
The previous code for filtering out non-finite numbers was broken, as it would convert `null` to `0`, as well as arrays. This change fixes this by converting null/undefined/NaN/Infinity/any object to the empty string. Closes #6188 Closes #6261
1 parent 3018ff7 commit cceb455

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/ng/filter/filters.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ function numberFilter($locale) {
118118

119119
var DECIMAL_SEP = '.';
120120
function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
121-
if (isNaN(number) || !isFinite(number)) return '';
121+
if (number == null || !isFinite(number) || isObject(number)) return '';
122122

123123
var isNegative = number < 0;
124124
number = Math.abs(number);

test/ng/filter/filtersSpec.js

+5
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ describe('filters', function() {
128128
expect(number(1234)).toEqual('1,234');
129129
expect(number(1234.5678)).toEqual('1,234.568');
130130
expect(number(Number.NaN)).toEqual('');
131+
expect(number(null)).toEqual('');
132+
expect(number({})).toEqual('');
133+
expect(number([])).toEqual('');
134+
expect(number(+Infinity)).toEqual('');
135+
expect(number(-Infinity)).toEqual('');
131136
expect(number("1234.5678")).toEqual('1,234.568');
132137
expect(number(1/0)).toEqual("");
133138
expect(number(1, 2)).toEqual("1.00");

0 commit comments

Comments
 (0)