fix max digits

kloener · Mar 17, 2017 · 439c821 · 439c821
1 parent 8ff4c45
commit 439c821
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/e2e/web/public/fcsaNumber.js b/e2e/web/public/fcsaNumber.js
@@ -78,7 +78,7 @@
         if (decimalSeparator == null) {
           decimalSeparator = '.';
         }
-        validRegex = new RegExp("^-?\\d{0," + maxDigits + "}(\\" + decimalSeparator + "\\d*)?$");
+        validRegex = new RegExp("^-?\\d{0," + maxDigits + "}(\\.\\d*)?$");
         return function(val) {
           return validRegex.test(val);
         };

diff --git a/src/fcsaNumber.coffee b/src/fcsaNumber.coffee
@@ -31,8 +31,6 @@ fcsaNumberModule.directive 'fcsaNumber',
 
     makeMaxDecimals = (maxDecimals, decimalSeparator = '.') ->
       if maxDecimals > 0
-#        regexString = "^-?\\d*\\#{decimalSeparator}?\\d{0,#{maxDecimals}}$"
-# val contains a .
         regexString = "^-?\\d*\\.?\\d{0,#{maxDecimals}}$"
       else
         regexString = "^-?\\d*$"
@@ -47,7 +45,7 @@ fcsaNumberModule.directive 'fcsaNumber',
       (val, number) -> number >= minNumber
 
     makeMaxDigits = (maxDigits, decimalSeparator = '.') ->
-      validRegex = new RegExp "^-?\\d{0,#{maxDigits}}(\\#{decimalSeparator}\\d*)?$"
+      validRegex = new RegExp "^-?\\d{0,#{maxDigits}}(\\.\\d*)?$"
       (val) -> validRegex.test val
 
     makeIsValid = (options) ->
@@ -107,7 +105,6 @@ fcsaNumberModule.directive 'fcsaNumber',
         thousandSepRegEx = new RegExp "\\#{options.thousandSeparator}", 'g'
 
         ngModelCtrl.$parsers.unshift (viewVal) ->
-# remove thousand-separator
           noCommasVal = viewVal.toString().replace thousandSepRegEx, ''
           realNum = getRealNumber(noCommasVal, options.decimalSeparator)
           if isValid(realNum) || !realNum

diff --git a/src/fcsaNumber.js b/src/fcsaNumber.js
@@ -78,7 +78,7 @@
         if (decimalSeparator == null) {
           decimalSeparator = '.';
         }
-        validRegex = new RegExp("^-?\\d{0," + maxDigits + "}(\\" + decimalSeparator + "\\d*)?$");
+        validRegex = new RegExp("^-?\\d{0," + maxDigits + "}(\\.\\d*)?$");
         return function(val) {
           return validRegex.test(val);
         };

diff --git a/src/fcsaNumber.min.js b/src/fcsaNumber.min.js