From 1d17ae80ffb5df156298a0a9aa0bdd585aeebb12 Mon Sep 17 00:00:00 2001 From: Clark Pan Date: Mon, 7 Jul 2014 12:13:47 +1000 Subject: [PATCH] fix(currencyFilter): Remove hardcoded fractionSize in currency The hardcoded fractionSize in the `currencyFilter` makes the minFrac and maxFrac options in $locale redundant. The default minFrac and maxFrac options in $locale are functionally equivalent. --- src/ng/filter/filters.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ng/filter/filters.js b/src/ng/filter/filters.js index 54aa9baa3cfb..a2ed46b231d0 100644 --- a/src/ng/filter/filters.js +++ b/src/ng/filter/filters.js @@ -52,7 +52,7 @@ function currencyFilter($locale) { var formats = $locale.NUMBER_FORMATS; return function(amount, currencySymbol){ if (isUndefined(currencySymbol)) currencySymbol = formats.CURRENCY_SYM; - return formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, 2). + return formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP). replace(/\u00A4/g, currencySymbol); }; } @@ -179,6 +179,9 @@ function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) { if (fractionSize && fractionSize !== "0") formatedText += decimalSep + fraction.substr(0, fractionSize); } else { + if (isUndefined(fractionSize)) { + fractionSize = pattern.minFrac; + } if (fractionSize > 0 && number > -1 && number < 1) { formatedText = number.toFixed(fractionSize);