Add more filters for trapping keystrokes

marstyson · Sep 21, 2018 · 7f34bb5 · 7f34bb5
1 parent a88a856
commit 7f34bb5
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/build/ableplayer.dist.js b/build/ableplayer.dist.js
@@ -10558,7 +10558,12 @@
     }
 
     // Only use keypress to control player if focus is NOT on an input field or contenteditable element
-    if (!($(':focus').is('[contenteditable]') || ($(':focus').is('input')))) {
+    if (!(
+      $(':focus').is('[contenteditable]') ||
+      $(':focus').is('input') ||
+      e.target.hasAttribute('contenteditable') ||
+      e.target.tagName === 'INPUT'
+    )){
       if (which === 27) { // escape
         this.closePopups();
       }

diff --git a/build/ableplayer.js b/build/ableplayer.js
@@ -10558,7 +10558,12 @@
     }
 
     // Only use keypress to control player if focus is NOT on an input field or contenteditable element
-    if (!($(':focus').is('[contenteditable]') || ($(':focus').is('input')))) {
+    if (!(
+      $(':focus').is('[contenteditable]') ||
+      $(':focus').is('input') ||
+      e.target.hasAttribute('contenteditable') ||
+      e.target.tagName === 'INPUT'
+    )){
       if (which === 27) { // escape
         this.closePopups();
       }

diff --git a/build/ableplayer.min.css b/build/ableplayer.min.css
diff --git a/build/ableplayer.min.js b/build/ableplayer.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ableplayer",
-  "version": "3.1.12",
+  "version": "3.1.13",
   "description": "fully accessible HTML5 media player",
   "homepage": "http://ableplayer.github.io/ableplayer",
   "bugs": "https://github.com/ableplayer/ableplayer/issues",

diff --git a/scripts/event.js b/scripts/event.js
@@ -261,7 +261,12 @@
     }
 
     // Only use keypress to control player if focus is NOT on an input field or contenteditable element
-    if (!($(':focus').is('[contenteditable]') || ($(':focus').is('input')))) {
+    if (!(
+      $(':focus').is('[contenteditable]') ||
+      $(':focus').is('input') ||
+      e.target.hasAttribute('contenteditable') ||
+      e.target.tagName === 'INPUT'
+    )){
       if (which === 27) { // escape
         this.closePopups();
       }