Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extended fcsaNumber directive to support localization with Intl.NumberFormat #19

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Extended fcsaNumber directive to support localization with Intl.NumberFormat #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/fcsaNumber.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
/*! angular-fcsa-number (version 1.5.3) 2014-10-17 */
(function() {
var fcsaNumberModule,
numberFormatter = (typeof Intl === 'undefined' || typeof Intl.NumberFormat === 'undefined') ? null : new Intl.NumberFormat(),
thousandsSeparator = numberFormatter ? numberFormatter.format(1111).replace(/1/g, '') : ',',
decimalSeparator = numberFormatter ? numberFormatter.format(1.1).replace(/1/g, '') : '.',
__hasProp = {}.hasOwnProperty;

fcsaNumberModule = angular.module('fcsa-number', []);
Expand Down Expand Up @@ -33,12 +36,12 @@
return controlKeys.indexOf(which) === -1;
};
hasMultipleDecimals = function(val) {
return (val != null) && val.toString().split('.').length > 2;
return (val != null) && val.toString().split(decimalSeparator).length > 2;
};
makeMaxDecimals = function(maxDecimals) {
var regexString, validRegex;
if (maxDecimals > 0) {
regexString = "^-?\\d*\\.?\\d{0," + maxDecimals + "}$";
regexString = "^-?\\d*\\" + decimalSeparator + "?\\d{0," + maxDecimals + "}$";
} else {
regexString = "^-?\\d*$";
}
Expand All @@ -59,7 +62,7 @@
};
makeMaxDigits = function(maxDigits) {
var validRegex;
validRegex = new RegExp("^-?\\d{0," + maxDigits + "}(\\.\\d*)?$");
validRegex = new RegExp("^-?\\d{0," + maxDigits + "}(\\" + decimalSeparator + "\\d*)?$");
return function(val) {
return validRegex.test(val);
};
Expand Down Expand Up @@ -98,9 +101,9 @@
};
addCommasToInteger = function(val) {
var commas, decimals, wholeNumbers;
decimals = val.indexOf('.') == -1 ? '' : val.replace(/^-?\d+(?=\.)/, '');
wholeNumbers = val.replace(/(\.\d+)$/, '');
commas = wholeNumbers.replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
decimals = val.indexOf(decimalSeparator) == -1 ? '' : val.replace(new RegExp('/^-?\\d+(?=\\' + decimalSeparator + ')/'), '');
wholeNumbers = val.replace(new RegExp('/(\\' + decimalSeparator + '\\d+)$/'), '');
commas = wholeNumbers.replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1' + thousandsSeparator);
return "" + commas + decimals;
};
return {
Expand All @@ -115,7 +118,7 @@
isValid = makeIsValid(options);
ngModelCtrl.$parsers.unshift(function(viewVal) {
var noCommasVal;
noCommasVal = viewVal.replace(/,/g, '');
noCommasVal = viewVal.replace(new RegExp('\\' + thousandsSeparator, 'g'), '');
if (isValid(noCommasVal) || !noCommasVal) {
ngModelCtrl.$setValidity('fcsaNumber', true);
return noCommasVal;
Expand Down Expand Up @@ -164,7 +167,7 @@
if (options.append != null) {
val = val.replace(options.append, '');
}
elem.val(val.replace(/,/g, ''));
elem.val(val.replace(new RegExp('\\' + thousandsSeparator, 'g'), ''));
return elem[0].select();
});
if (options.preventInvalidInput === true) {
Expand Down