diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/controls.js | 9 | ||||
| -rw-r--r-- | src/js/plugins/youtube.js | 5 | ||||
| -rw-r--r-- | src/js/plyr.js | 3 | ||||
| -rw-r--r-- | src/sass/components/controls.scss | 8 | ||||
| -rw-r--r-- | src/sass/lib/mixins.scss | 1 |
5 files changed, 18 insertions, 8 deletions
diff --git a/src/js/controls.js b/src/js/controls.js index 2bc8b4de..e95cfc86 100644 --- a/src/js/controls.js +++ b/src/js/controls.js @@ -1455,12 +1455,9 @@ const controls = { target = this.elements.container; } - // Inject controls HTML - if (is.element(container)) { - target.appendChild(container); - } else if (container) { - target.insertAdjacentHTML('beforeend', container); - } + // Inject controls HTML (needs to be before captions, hence "afterbegin") + const insertMethod = is.element(container) ? 'insertAdjacentElement' : 'insertAdjacentHTML'; + target[insertMethod]('afterbegin', container); // Find the elements if need be if (!is.element(this.elements.controls)) { diff --git a/src/js/plugins/youtube.js b/src/js/plugins/youtube.js index b521be3c..66a73acf 100644 --- a/src/js/plugins/youtube.js +++ b/src/js/plugins/youtube.js @@ -188,6 +188,7 @@ const youtube = { videoId, playerVars: { autoplay: player.config.autoplay ? 1 : 0, // Autoplay + hl: player.config.hl, // iframe interface language controls: player.supported.ui ? 0 : 1, // Only show controls if not fully supported rel: 0, // No related vids showinfo: 0, // Hide info @@ -239,6 +240,10 @@ const youtube = { triggerEvent.call(player, player.media, 'ratechange'); }, onReady(event) { + // Bail if onReady has already been called. See issue #1108 + if (is.function(player.media.play)) { + return; + } // Get the instance const instance = event.target; diff --git a/src/js/plyr.js b/src/js/plyr.js index 0f27b750..6d321112 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -171,7 +171,7 @@ class Plyr { this.elements.container.className = ''; // Get attributes from URL and set config - if (url.searchParams.length) { + if (url.search.length) { const truthy = ['1', 'true']; if (truthy.includes(url.searchParams.get('autoplay'))) { @@ -185,6 +185,7 @@ class Plyr { // YouTube requires the playsinline in the URL if (this.isYouTube) { this.config.playsinline = truthy.includes(url.searchParams.get('playsinline')); + this.config.hl = url.searchParams.get('hl'); } else { this.config.playsinline = true; } diff --git a/src/sass/components/controls.scss b/src/sass/components/controls.scss index 9b203f43..d06cb232 100644 --- a/src/sass/components/controls.scss +++ b/src/sass/components/controls.scss @@ -109,3 +109,11 @@ .plyr--fullscreen-enabled [data-plyr='fullscreen'] { display: inline-block; } + +.plyr__controls:empty { + display: none; + + ~ .plyr__captions { + transform: translateY(0); + } +} diff --git a/src/sass/lib/mixins.scss b/src/sass/lib/mixins.scss index 8b333f65..7bbf94f5 100644 --- a/src/sass/lib/mixins.scss +++ b/src/sass/lib/mixins.scss @@ -28,7 +28,6 @@ border: 0; border-radius: ($plyr-range-track-height / 2); height: $plyr-range-track-height; - transition: all 0.3s ease; user-select: none; } |