feat: modify filter function on readOnly element (#73)

jaywcjlove · May 9, 2019 · 8e2c1b5 · 8e2c1b5
1 parent 9d6e2b9
commit 8e2c1b5
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 10 deletions.
diff --git a/dist/hotkeys.common.js b/dist/hotkeys.common.js
@@ -159,13 +159,19 @@ function getScope() {
 function getPressedKeyCodes() {
   return _downKeys.slice(0);
 } // 表单控件控件判断 返回 Boolean
+// hotkey is effective only when filter return true
 
 
 function filter(event) {
   var target = event.target || event.srcElement;
-  var tagName = target.tagName; // 忽略这些情况下快捷键无效
+  var tagName = target.tagName;
+  var flag = true; // ignore: isContentEditable === 'true', <input> and <textarea> when readOnly state is false, <select>
 
-  return !(tagName === 'INPUT' || tagName === 'SELECT' || tagName === 'TEXTAREA' || target.isContentEditable);
+  if (target.isContentEditable || tagName === 'TEXTAREA' || (tagName === 'INPUT' || tagName === 'TEXTAREA') && !target.readOnly) {
+    flag = false;
+  }
+
+  return flag;
 } // 判断摁下的键是否为某个键，返回true或者false
 
 

diff --git a/dist/hotkeys.common.min.js b/dist/hotkeys.common.min.js
diff --git a/dist/hotkeys.esm.js b/dist/hotkeys.esm.js
@@ -157,13 +157,19 @@ function getScope() {
 function getPressedKeyCodes() {
   return _downKeys.slice(0);
 } // 表单控件控件判断 返回 Boolean
+// hotkey is effective only when filter return true
 
 
 function filter(event) {
   var target = event.target || event.srcElement;
-  var tagName = target.tagName; // 忽略这些情况下快捷键无效
+  var tagName = target.tagName;
+  var flag = true; // ignore: isContentEditable === 'true', <input> and <textarea> when readOnly state is false, <select>
 
-  return !(tagName === 'INPUT' || tagName === 'SELECT' || tagName === 'TEXTAREA' || target.isContentEditable);
+  if (target.isContentEditable || tagName === 'TEXTAREA' || (tagName === 'INPUT' || tagName === 'TEXTAREA') && !target.readOnly) {
+    flag = false;
+  }
+
+  return flag;
 } // 判断摁下的键是否为某个键，返回true或者false
 
 

diff --git a/dist/hotkeys.js b/dist/hotkeys.js
@@ -163,13 +163,19 @@
   function getPressedKeyCodes() {
     return _downKeys.slice(0);
   } // 表单控件控件判断 返回 Boolean
+  // hotkey is effective only when filter return true
 
 
   function filter(event) {
     var target = event.target || event.srcElement;
-    var tagName = target.tagName; // 忽略这些情况下快捷键无效
+    var tagName = target.tagName;
+    var flag = true; // ignore: isContentEditable === 'true', <input> and <textarea> when readOnly state is false, <select>
 
-    return !(tagName === 'INPUT' || tagName === 'SELECT' || tagName === 'TEXTAREA' || target.isContentEditable);
+    if (target.isContentEditable || tagName === 'TEXTAREA' || (tagName === 'INPUT' || tagName === 'TEXTAREA') && !target.readOnly) {
+      flag = false;
+    }
+
+    return flag;
   } // 判断摁下的键是否为某个键，返回true或者false