diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/controls.js | 4 | ||||
| -rw-r--r-- | src/js/listeners.js | 7 | ||||
| -rw-r--r-- | src/sass/components/controls.scss | 8 | ||||
| -rw-r--r-- | src/sass/components/volume.scss | 9 |
4 files changed, 5 insertions, 23 deletions
diff --git a/src/js/controls.js b/src/js/controls.js index 7993dcb8..15c82716 100644 --- a/src/js/controls.js +++ b/src/js/controls.js @@ -139,7 +139,7 @@ const controls = { // Create hidden text label createLabel(key, attr = {}) { const text = i18n.get(key, this.config); - const attributes = { ...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); }, @@ -1378,6 +1378,8 @@ const controls = { } // Volume range control + // 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 = { diff --git a/src/js/listeners.js b/src/js/listeners.js index 643b7dd3..f6b01763 100644 --- a/src/js/listeners.js +++ b/src/js/listeners.js @@ -377,13 +377,6 @@ class Listeners { controls.durationUpdate.call(player, event), ); - // Check for audio tracks on load - // We can't use `loadedmetadata` as it doesn't seem to have audio tracks at that point - on.call(player, player.media, 'canplay loadeddata', () => { - toggleHidden(elements.volume, !player.hasAudio); - toggleHidden(elements.buttons.mute, !player.hasAudio); - }); - // Handle the media finishing on.call(player, player.media, 'ended', () => { // Show poster on end diff --git a/src/sass/components/controls.scss b/src/sass/components/controls.scss index 8abee204..cc07ef7f 100644 --- a/src/sass/components/controls.scss +++ b/src/sass/components/controls.scss @@ -41,14 +41,6 @@ &.plyr__time + .plyr__time { padding-left: 0; } - - &.plyr__volume { - padding-right: ($plyr-control-spacing / 2); - } - - &.plyr__volume:first-child { - padding-right: 0; - } } // Hide empty controls diff --git a/src/sass/components/volume.scss b/src/sass/components/volume.scss index b89b4531..76fb6229 100644 --- a/src/sass/components/volume.scss +++ b/src/sass/components/volume.scss @@ -5,11 +5,12 @@ .plyr__volume { align-items: center; display: flex; - flex: 1; + // flex: 1; position: relative; input[type='range'] { margin-left: ($plyr-control-spacing / 2); + margin-right: ($plyr-control-spacing / 2); position: relative; z-index: 2; } @@ -22,9 +23,3 @@ max-width: 110px; } } - -// Vimeo has no toggle mute method so hide mute button -// https://github.com/vimeo/player.js/issues/236#issuecomment-384663183 -.plyr--is-ios.plyr--vimeo [data-plyr='mute'] { - display: none !important; -} |