arrow key error

firstopinion · 83ac6d482d8676adc39fd9bb23295bb48a286884 · jaridmargolin committed Oct 29, 2013 · Oct 29, 2013 · 83ac6d4
1 parent 9fb178f
commit 83ac6d482d8676adc39fd9bb23295bb48a286884
diff --git a/lib/formatter.js b/lib/formatter.js
@@ -113,13 +113,17 @@ Formatter.prototype._keyDown = function (evt) {
 //
 Formatter.prototype._keyPress = function (evt) {
   // The first thing we need is the character code
-  var k;
+  var k, isSpecial;
   // Mozilla will trigger on special keys and assign the the value 0
   // We want to use that 0 rather than the keyCode it assigns.
-  k = (evt.which || evt.which === 0) ? evt.which : evt.keyCode;
-
+  if (evt.which) {
+    k = evt.which;
+  } else {
+    k = evt.keyCode;
+    isSpecial = utils.isSpecialKey(k);
+  }
   // Process the keyCode and prevent default
-  if (!utils.isSpecialKey(k) && !utils.isModifier(evt)) {
+  if (!utils.isDelKey(k) && !isSpecial && !utils.isModifier(evt)) {
     this._processKey(String.fromCharCode(k), false);
     return utils.preventDefault(evt);
   }
@@ -567,9 +571,7 @@ utils.isSpecialKey = function (k) {
     '40': 'downarrow'
   };
   // If del or special key
-  return (this.isDelKey(k) || codes[k])
-    ? true
-    : false;
+  return codes[k];
 };
 
 //
diff --git a/lib/formatter.min.js b/lib/formatter.min.js
diff --git a/lib/jquery.formatter.js b/lib/jquery.formatter.js
@@ -110,13 +110,17 @@ Formatter.prototype._keyDown = function (evt) {
 //
 Formatter.prototype._keyPress = function (evt) {
   // The first thing we need is the character code
-  var k;
+  var k, isSpecial;
   // Mozilla will trigger on special keys and assign the the value 0
   // We want to use that 0 rather than the keyCode it assigns.
-  k = (evt.which || evt.which === 0) ? evt.which : evt.keyCode;
-
+  if (evt.which) {
+    k = evt.which;
+  } else {
+    k = evt.keyCode;
+    isSpecial = utils.isSpecialKey(k);
+  }
   // Process the keyCode and prevent default
-  if (!utils.isSpecialKey(k) && !utils.isModifier(evt)) {
+  if (!utils.isDelKey(k) && !isSpecial && !utils.isModifier(evt)) {
     this._processKey(String.fromCharCode(k), false);
     return utils.preventDefault(evt);
   }
@@ -564,9 +568,7 @@ utils.isSpecialKey = function (k) {
     '40': 'downarrow'
   };
   // If del or special key
-  return (this.isDelKey(k) || codes[k])
-    ? true
-    : false;
+  return codes[k];
 };
 
 //