diff options
author | Sam Potts <sam@potts.es> | 2018-06-09 17:03:16 +1000 |
---|---|---|
committer | Sam Potts <sam@potts.es> | 2018-06-09 17:03:16 +1000 |
commit | 7c6d4666e99f1604c28c57bec12f16bd0fb7e79c (patch) | |
tree | 2b5e3288defe5760694fe1096cc1d9c3490f3118 /src/js/listeners.js | |
parent | 90c5735904354f5fde0dcdae9f8894fe9088739c (diff) | |
parent | 76bb299c68a6b5cc72729771aca2f0d51078ebc5 (diff) | |
download | plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.tar.lz plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.tar.xz plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.zip |
Merge branch 'develop' into a11y-improvements
# Conflicts:
# demo/dist/demo.css
# dist/plyr.css
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# src/js/captions.js
# src/js/plyr.js
Diffstat (limited to 'src/js/listeners.js')
-rw-r--r-- | src/js/listeners.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/js/listeners.js b/src/js/listeners.js index 86236fe3..81f5271c 100644 --- a/src/js/listeners.js +++ b/src/js/listeners.js @@ -74,7 +74,10 @@ class Listeners { // and if the focused element is not editable (e.g. text input) // and any that accept key input http://webaim.org/techniques/keyboard/ const focused = utils.getFocusElement(); - if (utils.is.element(focused) && utils.matches(focused, this.player.config.selectors.editable)) { + if (utils.is.element(focused) && ( + focused !== this.player.elements.inputs.seek && + utils.matches(focused, this.player.config.selectors.editable)) + ) { return; } @@ -560,6 +563,12 @@ class Listeners { on(this.player.elements.inputs.seek, 'mousedown mouseup keydown keyup touchstart touchend', event => { const seek = event.currentTarget; + const code = event.keyCode ? event.keyCode : event.which; + const eventType = event.type; + + if ((eventType === 'keydown' || eventType === 'keyup') && (code !== 39 && code !== 37)) { + return; + } // Was playing before? const play = seek.hasAttribute('play-on-seeked'); |