Fix the isDecimal() validator, closes #419, cc #406

validatorjs · Aug 4, 2015 · 6f83606 · 6f83606
1 parent a08ec14
commit 6f83606
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/test/validators.js b/test/validators.js
@@ -567,7 +567,7 @@ describe('Validators', function () {
             ]
         });
     });
-    
+
     it('should validate decimal numbers', function () {
         test({
             validator: 'isDecimal'
@@ -588,6 +588,9 @@ describe('Validators', function () {
           , invalid: [
                 '....'
               , ' '
+              , ''
+              , '-'
+              , '+'
               , '.'
               , '0.1a'
               , 'a'

diff --git a/validator.js b/validator.js
@@ -64,7 +64,7 @@
       , int = /^(?:[-+]?(?:0|[1-9][0-9]*))$/
       , float = /^(?:[-+]?(?:[0-9]+))?(?:\.[0-9]*)?(?:[eE][\+\-]?(?:[0-9]+))?$/
       , hexadecimal = /^[0-9A-F]+$/i
-      , decimal = /^[-+]?[0-9]*(\.[0-9]+)?$/
+      , decimal = /^[-+]?([0-9]+|\.[0-9]+|[0-9]+\.[0-9]+)$/
       , hexcolor = /^#?([0-9A-F]{3}|[0-9A-F]{6})$/i;
 
     var ascii = /^[\x00-\x7F]+$/
@@ -394,9 +394,9 @@
     validator.isNumeric = function (str) {
         return numeric.test(str);
     };
-    
+
     validator.isDecimal = function (str) {
-        return decimal.test(str);
+        return str !== '' && decimal.test(str);
     };
 
     validator.isHexadecimal = function (str) {