Add more filters for trapping keystrokes within form fields

marstyson · Oct 29, 2018 · 6842524 · 6842524
1 parent 3d2863a
commit 6842524
Show file tree

Hide file tree

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

diff --git a/build/ableplayer.js b/build/ableplayer.js
@@ -10565,12 +10565,16 @@
       which += 32;
     }
 
-    // Only use keypress to control player if focus is NOT on an input field or contenteditable element
+    // Only use keypress to control player if focus is NOT on a form field or contenteditable element
     if (!(
       $(':focus').is('[contenteditable]') ||
       $(':focus').is('input') ||
+      $(':focus').is('textarea') ||
+      $(':focus').is('select') ||
       e.target.hasAttribute('contenteditable') ||
-      e.target.tagName === 'INPUT'
+      e.target.tagName === 'INPUT' ||
+      e.target.tagName === 'TEXTAREA' ||
+      e.target.tagName === 'SELECT'
     )){
       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-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ableplayer",
-  "version": "3.1.16",
+  "version": "3.1.17",
   "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
@@ -260,12 +260,16 @@
       which += 32;
     }
 
-    // Only use keypress to control player if focus is NOT on an input field or contenteditable element
+    // Only use keypress to control player if focus is NOT on a form field or contenteditable element
     if (!(
       $(':focus').is('[contenteditable]') ||
       $(':focus').is('input') ||
+      $(':focus').is('textarea') ||
+      $(':focus').is('select') ||
       e.target.hasAttribute('contenteditable') ||
-      e.target.tagName === 'INPUT'
+      e.target.tagName === 'INPUT' ||
+      e.target.tagName === 'TEXTAREA' ||
+      e.target.tagName === 'SELECT'
     )){
       if (which === 27) { // escape
         this.closePopups();