aboutsummaryrefslogtreecommitdiffstats
path: root/src/js
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2018-06-08 10:54:16 +1000
committerGitHub <noreply@github.com>2018-06-08 10:54:16 +1000
commit8e634862ff7a1307f3e72c7ed6a92092711ab4d5 (patch)
tree093451d4609fb7e3cdbe38255fa59945336325cc /src/js
parent108bd3dfa078cf22c0446373830e86cba586919c (diff)
parent84424f7f67461a3da7f3a1ba1ffea6505dddc4dc (diff)
downloadplyr-8e634862ff7a1307f3e72c7ed6a92092711ab4d5.tar.lz
plyr-8e634862ff7a1307f3e72c7ed6a92092711ab4d5.tar.xz
plyr-8e634862ff7a1307f3e72c7ed6a92092711ab4d5.zip
Merge pull request #1007 from cky917/master
fix: After clicking on the progress bar, keyboard operations will not work.
Diffstat (limited to 'src/js')
-rw-r--r--src/js/defaults.js2
-rw-r--r--src/js/listeners.js11
-rw-r--r--src/js/plyr.js2
-rw-r--r--src/js/plyr.polyfilled.js2
4 files changed, 13 insertions, 4 deletions
diff --git a/src/js/defaults.js b/src/js/defaults.js
index 8d92219a..16df8624 100644
--- a/src/js/defaults.js
+++ b/src/js/defaults.js
@@ -56,7 +56,7 @@ const defaults = {
// Sprite (for icons)
loadSprite: true,
iconPrefix: 'plyr',
- iconUrl: 'https://cdn.plyr.io/3.3.9/plyr.svg',
+ iconUrl: 'https://cdn.plyr.io/3.3.10/plyr.svg',
// Blank video (used to prevent errors on source change)
blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
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');
diff --git a/src/js/plyr.js b/src/js/plyr.js
index cfce37c9..5c51d617 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
-// plyr.js v3.3.9
+// plyr.js v3.3.10
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================
diff --git a/src/js/plyr.polyfilled.js b/src/js/plyr.polyfilled.js
index 3f45ec40..f66a82de 100644
--- a/src/js/plyr.polyfilled.js
+++ b/src/js/plyr.polyfilled.js
@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr Polyfilled Build
-// plyr.js v3.3.9
+// plyr.js v3.3.10
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================