diff options
| author | Sam Potts <sam@potts.es> | 2018-07-24 09:38:26 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-07-24 09:38:26 +1000 |
| commit | 53a3d061038bd39628d3a47ca787311b2b36c496 (patch) | |
| tree | 7cc09edf868cf71099686c6092647e0560a6e774 /src | |
| parent | e63ad7c74bd763043344fd2bd568a64e7ea18622 (diff) | |
| parent | 544ab0086b06a1625c474b35c1f100d4a582a98a (diff) | |
| download | plyr-53a3d061038bd39628d3a47ca787311b2b36c496.tar.lz plyr-53a3d061038bd39628d3a47ca787311b2b36c496.tar.xz plyr-53a3d061038bd39628d3a47ca787311b2b36c496.zip | |
Merge branch 'develop' into a11y-improvements
# Conflicts:
# demo/dist/demo.css
# demo/dist/demo.js.map
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# dist/plyr.css
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# package.json
# yarn.lock
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/captions.js | 2 | ||||
| -rw-r--r-- | src/js/plyr.js | 2 | ||||
| -rw-r--r-- | src/js/plyr.polyfilled.js | 2 | ||||
| -rw-r--r-- | src/sass/components/embed.scss | 5 | ||||
| -rw-r--r-- | src/sass/components/poster.scss | 2 |
5 files changed, 4 insertions, 9 deletions
diff --git a/src/js/captions.js b/src/js/captions.js index 9dca5505..14f77a2e 100644 --- a/src/js/captions.js +++ b/src/js/captions.js @@ -84,7 +84,7 @@ const captions = { // * toggled: The real captions state const languages = dedupe( - Array.from(navigator.languages || navigator.userLanguage).map(language => language.split('-')[0]), + Array.from(navigator.languages || navigator.language || navigator.userLanguage).map(language => language.split('-')[0]), ); let language = (this.storage.get('language') || this.config.captions.language || 'auto').toLowerCase(); diff --git a/src/js/plyr.js b/src/js/plyr.js index cbf88793..ab1f7866 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v3.3.16 +// plyr.js v3.3.22 // 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 062f11a1..574ad5e5 100644 --- a/src/js/plyr.polyfilled.js +++ b/src/js/plyr.polyfilled.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr Polyfilled Build -// plyr.js v3.3.16 +// plyr.js v3.3.22 // https://github.com/sampotts/plyr // License: The MIT License (MIT) // ========================================================================== diff --git a/src/sass/components/embed.scss b/src/sass/components/embed.scss index be807739..25431caf 100644 --- a/src/sass/components/embed.scss +++ b/src/sass/components/embed.scss @@ -27,11 +27,6 @@ $embed-padding: ((100 / 16) * 9); $height: 240; $offset: to-percentage(($height - $embed-padding) / ($height / 50)); - // To allow mouse events to be captured if full support - iframe { - pointer-events: none; - } - // Only used for Vimeo > .plyr__video-embed__container { padding-bottom: to-percentage($height); diff --git a/src/sass/components/poster.scss b/src/sass/components/poster.scss index 4bdb60d9..9bf7398d 100644 --- a/src/sass/components/poster.scss +++ b/src/sass/components/poster.scss @@ -15,9 +15,9 @@ transition: opacity 0.3s ease; width: 100%; z-index: 1; - pointer-events: none; } .plyr--stopped.plyr__poster-enabled .plyr__poster { opacity: 1; + pointer-events: none; } |