Skip to content
This repository was archived by the owner on Sep 24, 2020. It is now read-only.

Validate digit and reorder test. #50

Open
alexismartin wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Validate digit and reorder test. #50

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8de24d4
Add test to validate digit.
alexismartin Sep 9, 2014
6f1946d
Reorder test to disable letter input.
alexismartin Sep 9, 2014
6859e05
Disable letters in cc number for Firefox
alexismartin Sep 12, 2014
da30519
Use charCode to detect control keys in firefox
alexismartin Sep 22, 2014
51edc7c
Validate keys in the same way
tjwallace Sep 29, 2014
d0d8250
Allow text selection in CVC input
tjwallace Sep 29, 2014
4d67145
Only allow digits in CVC
tjwallace Sep 29, 2014
e182ef1
Merge pull request #1 from zozi/master
alexismartin Sep 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions lib/angular-payments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,11 @@ angular.module('angularPayments', []);angular.module('angularPayments')
return false;
};

var isInvalidKey = function(e) {
var digit = String.fromCharCode(e.which);
return !/^\d+$/.test(digit) && !e.meta && e.charCode !== 0 && !e.ctrlKey;
};

// card formatting

var _formatCardNumber = function(e) {
Expand All @@ -189,12 +194,8 @@ angular.module('angularPayments', []);angular.module('angularPayments')
if (card) {
upperLength = card.length[card.length.length - 1];
}

if (length >= upperLength) {
return;
}

if (!/^\d+$/.test(digit) && !e.meta && e.keyCode >= 46) {
if (isInvalidKey(e)) {
e.preventDefault();
return;
}
Expand All @@ -207,8 +208,12 @@ angular.module('angularPayments', []);angular.module('angularPayments')
if (card) {
re = card.inputFormat;
}

if (length >= upperLength) {
return;
}

if (re.test(value)) {
if (re.test(value) && /^\d+$/.test(digit)) {
e.preventDefault();
return $target.val(value + ' ' + digit);

Expand Down Expand Up @@ -332,12 +337,17 @@ angular.module('angularPayments', []);angular.module('angularPayments')
$target = angular.element(e.currentTarget);
digit = String.fromCharCode(e.which);

if (!/^\d+$/.test(digit) && !e.meta && e.keyCode >= 46) {
if (isInvalidKey(e)) {
e.preventDefault();
return;
}

if(_hasTextSelected($target)) {
return;
}

val = $target.val() + digit;
val = val.replace(/\D/g, '');

if(val.length <= 4){
return;
Expand All @@ -359,7 +369,7 @@ angular.module('angularPayments', []);angular.module('angularPayments')
$target = angular.element(e.currentTarget);
digit = String.fromCharCode(e.which);

if (!/^\d+$/.test(digit) && !e.meta && e.keyCode >= 46) {
if (isInvalidKey(e)) {
e.preventDefault();
return;
}
Expand All @@ -382,7 +392,7 @@ angular.module('angularPayments', []);angular.module('angularPayments')

digit = String.fromCharCode(e.which);

if (!/^\d+$/.test(digit) && !e.meta && e.keyCode >= 46) {
if (isInvalidKey(e)) {
e.preventDefault();
return;
}
Expand All @@ -406,7 +416,7 @@ angular.module('angularPayments', []);angular.module('angularPayments')

digit = String.fromCharCode(e.which);

if (!/^\d+$/.test(digit) && !e.meta && e.keyCode >= 46) {
if (isInvalidKey(e)) {
return;
}

Expand Down