Merge pull request #47 from fernahh/v2.1.0

Bump version to v2.1.0
ContaAzul · Aug 22, 2016 · 7040aa2 · 7040aa2
2 parents 7d41392 + bf05b5e
commit 7040aa2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -6,8 +6,6 @@
 
 > A simple credit cards validation library in JavaScript.
 
-<img src="assets/images/credit-card-logo.png" alt="creditcard.js" />
-
 ## Install
 
 You can [download the zip file](https://github.com/contaazul/creditcard.js/archive/master.zip) or use NPM and Bower.

diff --git a/assets/images/credit-card-logo.png b/assets/images/credit-card-logo.png
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "creditcard.js",
   "description": "A simple library for credit-card validation in JavaScript",
   "main": "dist/creditcard.min.js",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "authors": [
     "@ContaAzul"
   ],

diff --git a/dist/creditcard.js b/dist/creditcard.js
@@ -1,5 +1,5 @@
 /*!
- * creditcard.js v2.0.3
+ * creditcard.js v2.1.0
  * Created by @ContaAzul.
  *
  * Licensed MIT.
@@ -53,7 +53,7 @@ var CreditCard = function () {
     key: 'isSecurityCodeValid',
     value: function isSecurityCodeValid(number, code) {
       var brand = this.getCreditCardNameByNumber(number);
-      var numberLength = undefined;
+      var numberLength = void 0;
 
       numberLength = brand === 'Amex' ? 4 : 3;
       var regex = new RegExp('^[0-9]{' + numberLength + '}$');
@@ -69,6 +69,8 @@ var CreditCard = function () {
       m = parseInt(m, 10);
       y = parseInt(y, 10);
 
+      if (isNaN(m) || isNaN(y)) return false;
+
       if (m < 1 || m > 12) return false;
 
       return !(y < 1000 || y >= 3000);
@@ -107,7 +109,7 @@ var CREDIT_CARD_LIST = [{
   regexpFull: '^50[0-9]{14,17}$'
 }, {
   name: 'Mastercard',
-  regexpFull: '^5[1-5][0-9]{14}$'
+  regexpFull: '^(5[1-5][0-9]{14}|2221[0-9]{12}|222[2-9][0-9]{12}|22[3-9][0-9]{13}|2[3-6][0-9]{14}|27[01][0-9]{13}|2720[0-9]{12})$'
 }, {
   name: 'Visa',
   regexpFull: '^4[0-9]{12}(?:[0-9]{3})?$'

diff --git a/dist/creditcard.min.js b/dist/creditcard.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "creditcard.js",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "A simple library for credit-card validation in JavaScript",
   "main": "dist/creditcard.min.js",
   "repository": "ContaAzul/creditcard.js",

diff --git a/src/creditCardList.js b/src/creditCardList.js
@@ -19,8 +19,7 @@ const CREDIT_CARD_LIST = [
     regexpFull: '^50[0-9]{14,17}$'
   }, {
     name: 'Mastercard',
-    regexpFull: '^5[1-5][0-9]{14}$'
-    //regexpFull: '^(5[1-5][0-9]{14}|2221[0-9]{12}|222[2-9][0-9]{12}|22[3-9][0-9]{13}|2[3-6][0-9]{14}|27[01][0-9]{13}|2720[0-9]{12})$'  //After October
+    regexpFull: '^(5[1-5][0-9]{14}|2221[0-9]{12}|222[2-9][0-9]{12}|22[3-9][0-9]{13}|2[3-6][0-9]{14}|27[01][0-9]{13}|2720[0-9]{12})$'
   }, {
     name: 'Visa',
     regexpFull: '^4[0-9]{12}(?:[0-9]{3})?$'