cvv validation now supports amex victorjonsson#197

Author: victorjonsson

form-validator/date.dev.js

@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.beta.13
+ * @version 2.2.beta.15
  */
 (function($) {
 

form-validator/file.dev.js

@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.beta.13
+ * @version 2.2.beta.15
  */
 (function($, window) {
 

form-validator/html5.dev.js

@@ -17,7 +17,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.beta.13
+ * @version 2.2.beta.15
  */
 (function($, window) {
 

form-validator/jquery.form-validator.js

@@ -5,7 +5,7 @@
 *
 * @website http://formvalidator.net/
 * @license Dual licensed under the MIT or GPL Version 2 licenses
-* @version 2.2.beta.13
+* @version 2.2.beta.15
 */
 (function($) {
 

form-validator/jquery.form-validator.min.js

@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.beta.13
+ * @version 2.2.beta.15
  */
 (function($) {
 

form-validator/location.dev.js

@@ -253,6 +253,7 @@
 
             var links = [
                 {val:'012', isValid:true},
+                {val:'0124', isValid:false},
                 {val:'000', isValid:true},
                 {val:'01', isValid:false},
                 {val:'a12', isValid:false}
@@ -261,6 +262,28 @@
             $.each(links, function(i, obj) {
                 runTest(obj, 'cvv');
             });
+
+            // check with amex only
+            var $cCard = input('', {'allowing':'amex', '':'creditcard'}),
+                $cvv = input('1234', 'cvv'),
+                result;
+
+            // let the validator know which type of card we're validating
+            $.formUtils.validateInput($cCard, $.formUtils.LANG, $.formUtils.defaultConfig(), $form)
+
+            result = $.formUtils.validateInput($cvv, $.formUtils.LANG, $.formUtils.defaultConfig(), $form);
+            equal(
+                true,
+                result
+            );
+
+            $cvv.val('123');
+            result = $.formUtils.validateInput($cvv, $.formUtils.LANG, $.formUtils.defaultConfig(), $form);
+            equal(
+                'string',
+                typeof result
+            );
+
         });
 
 

form-validator/qunit.html

@@ -13,7 +13,7 @@
  *  - cvv
  *
  * @website http://formvalidator.net/#security-validators
- * @version 2.2.beta.13
+ * @version 2.2.beta.15
  */
 (function($, window) {
 
@@ -55,31 +55,37 @@
         errorMessageKey: 'notConfirmed'
     });
 
+    var creditCards = {
+            'amex' : [15,15],
+            'diners_club' : [14,14],
+            'cjb' : [16,16],
+            'laser' : [16,19],
+            'visa' : [16,16],
+            'mastercard' : [16,16],
+            'maestro' : [12,19],
+            'discover' : [16,16]
+        },
+        checkOnlyAmex = false,
+        allowsAmex = false;
+
     /*
      * Credit card
      */
     $.formUtils.addValidator({
         name : 'creditcard',
         validatorFunction : function(value, $el, config, language, $form) {
-            var cards = {
-                'amex' : [15,15],
-                'diners_club' : [14,14],
-                'cjb' : [16,16],
-                'laser' : [16,19],
-                'visa' : [16,16],
-                'mastercard' : [16,16],
-                'maestro' : [12,19],
-                'discover' : [16,16]
-            },
-            allowing = $.split( $el.valAttr('allowing') || '' );
+            var allowing = $.split( $el.valAttr('allowing') || '' );
 
+            // Setup for cvv validation
+            allowsAmex = $.inArray('amex', allowing) > -1;
+            checkOnlyAmex = allowsAmex && allowing.length == 1;
 
             // Correct length
             if( allowing.length > 0 ) {
                 var hasValidLength = false;
                 $.each(allowing, function(i, cardName) {
-                    if( cardName in cards) {
-                        if( value.length >= cards[cardName][0] && value.length <= cards[cardName][1]) {
+                    if( cardName in creditCards) {
+                        if( value.length >= creditCards[cardName][0] && value.length <= creditCards[cardName][1]) {
                             hasValidLength = true;
                             return false;
                         }
@@ -126,7 +132,17 @@
     $.formUtils.addValidator({
         name : 'cvv',
         validatorFunction : function(val) {
-            return val.replace(/[0-9]/g, '') === '' && (val + '').length == 3;
+            if( val.replace(/[0-9]/g, '') === '' ) {
+                val = val + '';
+                if( checkOnlyAmex ) {
+                    return val.length == 4;
+                } else if( allowsAmex ) {
+                    return val.length == 3 || val.length == 4;
+                } else {
+                    return val.length == 3;
+                }
+            }
+            return false;
         },
         errorMessage : '',
         errorMessageKey: 'badCVV'

form-validator/security.dev.js

@@ -13,7 +13,7 @@
  *
  * @website http://formvalidator.net/#swedish-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.beta.13
+ * @version 2.2.beta.15
  */
 (function($, window) {
 

form-validator/security.js

@@ -9,7 +9,7 @@
  *
  * @website http://formvalidator.net/#uk-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.beta.13
+ * @version 2.2.beta.15
  */
 $.formUtils.addValidator({
     name : 'ukvatnumber',