diff options
author | Sam Potts <sam@potts.es> | 2020-01-30 14:23:40 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-30 14:23:40 +0000 |
commit | 58f5380694993891892e4e24ba0904434892e538 (patch) | |
tree | 4de3d7b46d33192a43a0b40c3f3a9a5f90f9b071 /src/js/controls.js | |
parent | 9d512911252cf4835c2b7364cb4ae392cb277a1d (diff) | |
parent | fefcca78052174dce73f8dfe7df5b264edb0653a (diff) | |
download | plyr-58f5380694993891892e4e24ba0904434892e538.tar.lz plyr-58f5380694993891892e4e24ba0904434892e538.tar.xz plyr-58f5380694993891892e4e24ba0904434892e538.zip |
Merge pull request #1662 from sampotts/develop
3.5.7
Diffstat (limited to 'src/js/controls.js')
-rw-r--r-- | src/js/controls.js | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/js/controls.js b/src/js/controls.js index 7afcd2c0..15c82716 100644 --- a/src/js/controls.js +++ b/src/js/controls.js @@ -139,10 +139,7 @@ const controls = { // Create hidden text label createLabel(key, attr = {}) { const text = i18n.get(key, this.config); - - const attributes = Object.assign({}, attr, { - class: [attr.class, this.config.classNames.hidden].filter(Boolean).join(' '), - }); + const attributes = { ...attr, class: [attr.class, this.config.classNames.hidden].filter(Boolean).join(' ') }; return createElement('span', attributes, text); }, @@ -402,7 +399,8 @@ const controls = { // https://bugzilla.mozilla.org/show_bug.cgi?id=1220143 bindMenuItemShortcuts(menuItem, type) { // Navigate through menus via arrow keys and space - on( + on.call( + this, menuItem, 'keydown keyup', event => { @@ -452,7 +450,7 @@ const controls = { // Enter will fire a `click` event but we still need to manage focus // So we bind to keyup which fires after and set focus here - on(menuItem, 'keyup', event => { + on.call(this, menuItem, 'keyup', event => { if (event.which !== 13) { return; } @@ -1380,7 +1378,9 @@ const controls = { } // Volume range control - if (control === 'volume') { + // Ignored on iOS as it's handled globally + // https://developer.apple.com/library/safari/documentation/AudioVideo/Conceptual/Using_HTML5_Audio_Video/Device-SpecificConsiderations/Device-SpecificConsiderations.html + if (control === 'volume' && !browser.isIos) { // Set the attributes const attributes = { max: 1, @@ -1463,7 +1463,7 @@ const controls = { bindMenuItemShortcuts.call(this, menuItem, type); // Show menu on click - on(menuItem, 'click', () => { + on.call(this, menuItem, 'click', () => { showMenuPanel.call(this, type, false); }); @@ -1515,7 +1515,8 @@ const controls = { ); // Go back via keyboard - on( + on.call( + this, pane, 'keydown', event => { @@ -1535,7 +1536,7 @@ const controls = { ); // Go back via button click - on(backButton, 'click', () => { + on.call(this, backButton, 'click', () => { showMenuPanel.call(this, 'home', false); }); |