Changeset 12675

Timestamp:

02/23/08 23:09:07 (3 months ago)

Author:

peller

Message:

don't do a dojo.indexOf on a hash. Fixes #5956

Files:

• dojox/trunk/validate/creditCard.js (modified) (3 diffs)

dojox/trunk/validate/creditCard.js

@@ -10 +10 @@
 dojox.validate.isValidCreditCard = function(/*String|Int*/value, /*String*/ccType){
         //Summary:
-        //  checks if type matches the # scheme, and if Luhn checksum is accurate (unless its an Enroute card, the checkSum is skipped)
+        //  checks if ccType matches the # scheme in value, and if Luhn checksum is accurate (unless its an Enroute card, the checkSum is skipped)
         
         //Value: Boolean
-        if(value&&ccType&&((ccType.toLowerCase()=='er'||dojox.validate.isValidLuhn(value))&&(dojox.validate.isValidCreditCardNumber(value,ccType.toLowerCase())))){
-                        return true; //Boolean
-        }
-        return false; //Boolean
+        return ((ccType.toLowerCase() == 'er' || dojox.validate.isValidLuhn(value)) &&
+                        dojox.validate.isValidCreditCardNumber(value,ccType.toLowerCase())); //Boolean
 }
-dojox.validate.isValidCreditCardNumber = function(/*String|Int*/value,/*String?*/ccType) {
-        //Summary:
-        //  checks if the # matches the pattern for that card or any card types if none is specified
-        //  value == CC #, white spaces and dashes are ignored
-        //  ccType is of the values in cardinfo -- if Omitted it it returns a | delimited string of matching card types, or false if no matches found
-        
-        //Value: Boolean
-        
-        if(typeof value!='string'){
-                value = String(value);
-        }
-        value = value.replace(/[- ]/g,''); //ignore dashes and whitespaces
+
+dojox.validate.isValidCreditCardNumber = function(/*String|Int*/value,/*String?*/ccType){
+        // summary:
+        //  checks if value matches the pattern for that card or any card types if none is specified
+        //
+        // value: Boolean
+        // CC #, white spaces and dashes are ignored
+        //
+        // ccType: String?
+        // one of the values in cardinfo -- if Omitted it it returns a | delimited string of matching card types, or false if no matches found
+
+        value = String(value).replace(/[- ]/g,''); //ignore dashes and whitespaces
+
         /*      FIXME: not sure on all the abbreviations for credit cards,below is what each stands for atleast to my knowledge
                 mc: Mastercard
@@ -41 +40 @@
                 er: Enroute
          */
+        var cardinfo = {
+                'mc':'5[1-5][0-9]{14}','ec':'5[1-5][0-9]{14}','vi':'4(?:[0-9]{12}|[0-9]{15})',
+                'ax':'3[47][0-9]{13}', 'dc':'3(?:0[0-5][0-9]{11}|[68][0-9]{12})',
+                'bl':'3(?:0[0-5][0-9]{11}|[68][0-9]{12})','di':'6011[0-9]{12}',
+                'jcb':'(?:3[0-9]{15}|(2131|1800)[0-9]{11})','er':'2(?:014|149)[0-9]{11}'
+        };
+        if(ccType){
+                var expr = cardinfo[ccType.toLowerCase()];
+                return expr ? !!(value.match(cardinfo[ccType.toLowerCase()])) : false; // boolean
+        }
         var results=[];
-        var cardinfo = {
-                'mc':'5[1-5][0-9]{14}','ec':'5[1-5][0-9]{14}','vi':'4([0-9]{12}|[0-9]{15})',
-                'ax':'3[47][0-9]{13}', 'dc':'3(0[0-5][0-9]{11}|[68][0-9]{12})',
-                'bl':'3(0[0-5][0-9]{11}|[68][0-9]{12})','di':'6011[0-9]{12}',
-                'jcb':'(3[0-9]{15}|(2131|1800)[0-9]{11})','er':'2(014|149)[0-9]{11}'
-        };
-        if(ccType&&dojo.indexOf(cardinfo,ccType.toLowerCase())){
-                return Boolean(value.match(cardinfo[ccType.toLowerCase()])); // boolean
-        }else{
-                for(var p in cardinfo){
-                        if(value.match('^'+cardinfo[p]+'$')!=null){
-                                results.push(p);
-                        }
+        for(var p in cardinfo){
+                if(value.match('^'+cardinfo[p]+'$')){
+                        results.push(p);
                 }
-                return (results.length)?results.join('|'):false; // string | boolean
-        }       
+        }
+        return results.length ? results.join('|') : false; // string | boolean
 }
 
@@ -85 +84 @@
         var flags = {format:format};
         //FIXME? Why does isNumberFormat take an object for flags when its only parameter is either a string or an array inside the object?
-        if ((value.length == format.length)&&(dojox.validate.isNumberFormat(value, flags))){
-                return true; //Boolean
-        }
-        return false; //Boolean
+        //FIXME: um... just check value.length?
+        return (value.length == format.length && dojox.validate.isNumberFormat(value, flags)); //Boolean
 }