Improved credit card number and expiry input formatting

Realityloop · May 10, 2013 · 9248498 · 9248498
1 parent a4c4e68
commit 9248498
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/lib/jquery.payment.js b/lib/jquery.payment.js
diff --git a/src/jquery.payment.coffee b/src/jquery.payment.coffee
@@ -165,12 +165,18 @@ formatBackCardNumber = (e) ->
 
   return if e.meta
 
+  # Return unless backspacing
+  return unless e.which is 8
+
   # Return if focus isn't at the end of the text
   return if $target.prop('selectionStart')? and
     $target.prop('selectionStart') isnt value.length
 
-  # If we're backspacing, remove the trailing space
-  if e.which is 8 and /\s\d?$/.test(value)
+  # Remove the trailing space
+  if /\d\s$/.test(value)
+    e.preventDefault()
+    $target.val(value.replace(/\d\s$/, ''))
+  else if /\s\d?$/.test(value)
     e.preventDefault()
     $target.val(value.replace(/\s\d?$/, ''))
 
@@ -227,7 +233,10 @@ formatBackExpiry = (e) ->
     $target.prop('selectionStart') isnt value.length
 
   # Remove the trailing space
-  if /\s\/\s?\d?$/.test(value)
+  if /\d(\s|\/)+$/.test(value)
+    e.preventDefault()
+    $target.val(value.replace(/\d(\s|\/)*$/, ''))
+  else if /\s\/\s?\d?$/.test(value)
     e.preventDefault()
     $target.val(value.replace(/\s\/\s?\d?$/, ''))
 
@@ -379,7 +388,7 @@ $.payment.validateCardExpiry = (month, year) =>
   return false unless /^\d+$/.test(month)
   return false unless /^\d+$/.test(year)
   return false unless parseInt(month, 10) <= 12
-  
+
   if year.length is 2
     prefix = (new Date).getFullYear()
     prefix = prefix.toString()[0..1]