3.5.6

Package upgrade
Edge fix
2019-06-21 12:35:47 +10:00 · 2019-06-21 12:35:22 +10:00 · 2019-06-21 12:34:49 +10:00 · 2019-06-21 00:24:28 +10:00 · 2019-06-21 00:19:51 +10:00 · 2019-06-21 00:19:37 +10:00
84 changed files with 17740 additions and 5657 deletions
@@ -1,6 +1,7 @@
 {
    "parser": "babel-eslint",
    "extends": ["airbnb-base", "prettier"],
    "plugins": ["simple-import-sort", "import"],
    "env": {
        "browser": true,
        "es6": true
@@ -10,24 +11,18 @@
        "jQuery": false
    },
    "rules": {
-        "import/no-cycle": 1,
+        "import/no-cycle": "warn",
-        "no-const-assign": 1,
+        "padding-line-between-statements": [
-        "no-shadow": 0,
+            "error",
-        "no-this-before-super": 1,
+            {
-        "no-undef": 1,
+                "blankLine": "never",
-        "no-unreachable": 1,
+                "prev": ["singleline-const", "singleline-let", "singleline-var"],
-        "no-unused-vars": 1,
+                "next": ["singleline-const", "singleline-let", "singleline-var"]
-        "constructor-super": 1,
+            }
-        "valid-typeof": 1,
+        ],
-        "indent": [2, 4, { "SwitchCase": 1 }],
+        "sort-imports": "off",
-        "quotes": [2, "single", "avoid-escape"],
+        "import/order": "off",
-        "semi": [2, "always"],
+        "simple-import-sort/sort": "error"
        "eqeqeq": [2, "always"],
        "one-var": [2, "never"],
        "comma-dangle": [2, "always-multiline"],
        "spaced-comment": [2, "always"],
        "no-restricted-globals": 2,
        "no-param-reassign": [2, { "props": false }]
    },
    "parserOptions": {
        "sourceType": "module"
@@ -0,0 +1,4 @@
 # These are supported funding model platforms
 github: sampotts
 patreon: plyr
@@ -3,9 +3,7 @@ node_modules
 credentials.json
 *.mp4
 !dist/blank.mp4
 index-*.html
 npm-debug.log
 yarn-error.log
 package-lock.json
 *.webm
 .idea/
@@ -10,13 +10,15 @@
            "src": "./src/js/plyr.polyfilled.js",
            "dist": "./dist/",
            "formats": ["es", "umd"],
-            "namespace": "Plyr"
+            "namespace": "Plyr",
            "polyfill": true
        },
        "demo.js": {
            "src": "./demo/src/js/demo.js",
            "dist": "./demo/dist/",
            "formats": ["iife"],
-            "namespace": "Demo"
+            "namespace": "Demo",
            "polyfill": true
        }
    },
    "css": {
@@ -1,3 +1,14 @@
 ## v3.5.6
 -   Another Edge fix (thanks Nick Hawk via Slack)
 ## v3.5.5
 -   YouTube fix for when there are other embeds on the page (thanks @aFarkas)
 -   Separated demo dependencies into their own package.json
 -   Fix for Edge controls flexbox issue when resizing the player (thanks Nick Hawk via Slack)
 -   More aspect ratio fixes
 ## v3.5.4
 -   Added: Set download URL via new setter
@@ -17,7 +17,7 @@
        <link rel="icon" type="image/png" href="https://cdn.plyr.io/static/icons/16x16.png" sizes="16x16" />
        <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.plyr.io/static/icons/180x180.png" />
-        <!-- Opengraph -->
+        <!-- Open Graph -->
        <meta
            property="og:title"
            content="Plyr - A simple, customizable HTML5 Video, Audio, YouTube and Vimeo player"
@@ -50,12 +50,23 @@
            type="font/woff2"
            href="https://cdn.plyr.io/static/fonts/gordita-bold.woff2"
        />
        <!-- Google Analytics-->
        <script async src="https://www.googletagmanager.com/gtag/js?id=UA-132699580-1"></script>
        <script>
            window.dataLayer = window.dataLayer || [];
            function gtag() {
                dataLayer.push(arguments);
            }
            gtag('js', new Date());
            gtag('config', 'UA-132699580-1');
        </script>
    </head>
    <body>
        <div class="grid">
            <header>
-                <h1>Plyr</h1>
+                <h1>Pl<span>a</span>y<span>e</span>r</h1>
                <p>
                    A simple, accessible and customisable media player for
                    <button type="button" class="faux-link" data-source="video">
@@ -106,22 +117,20 @@
                </p>
                <div class="call-to-action">
-                    <span class="button--with-count">
+                    <a href="https://github.com/sampotts/plyr" target="_blank" class="button js-shr">
-                        <a href="https://github.com/sampotts/plyr" target="_blank" class="button js-shr-button">
+                        <svg class="icon" role="presentation">
-                            <svg class="icon" role="presentation">
+                            <title>GitHub</title>
-                                <title>GitHub</title>
+                            <path
-                                <path
+                                d="M8,0.2c-4.4,0-8,3.6-8,8c0,3.5,2.3,6.5,5.5,7.6
-                                    d="M8,0.2c-4.4,0-8,3.6-8,8c0,3.5,2.3,6.5,5.5,7.6
+            C5.9,15.9,6,15.6,6,15.4c0-0.2,0-0.7,0-1.4C3.8,14.5,3.3,13,3.3,13c-0.4-0.9-0.9-1.2-0.9-1.2c-0.7-0.5,0.1-0.5,0.1-0.5
-               C5.9,15.9,6,15.6,6,15.4c0-0.2,0-0.7,0-1.4C3.8,14.5,3.3,13,3.3,13c-0.4-0.9-0.9-1.2-0.9-1.2c-0.7-0.5,0.1-0.5,0.1-0.5
+            c0.8,0.1,1.2,0.8,1.2,0.8C4.4,13.4,5.6,13,6,12.8c0.1-0.5,0.3-0.9,0.5-1.1c-1.8-0.2-3.6-0.9-3.6-4c0-0.9,0.3-1.6,0.8-2.1
-               c0.8,0.1,1.2,0.8,1.2,0.8C4.4,13.4,5.6,13,6,12.8c0.1-0.5,0.3-0.9,0.5-1.1c-1.8-0.2-3.6-0.9-3.6-4c0-0.9,0.3-1.6,0.8-2.1
+            c-0.1-0.2-0.4-1,0.1-2.1c0,0,0.7-0.2,2.2,0.8c0.6-0.2,1.3-0.3,2-0.3c0.7,0,1.4,0.1,2,0.3c1.5-1,2.2-0.8,2.2-0.8
-               c-0.1-0.2-0.4-1,0.1-2.1c0,0,0.7-0.2,2.2,0.8c0.6-0.2,1.3-0.3,2-0.3c0.7,0,1.4,0.1,2,0.3c1.5-1,2.2-0.8,2.2-0.8
+            c0.4,1.1,0.2,1.9,0.1,2.1c0.5,0.6,0.8,1.3,0.8,2.1c0,3.1-1.9,3.7-3.7,3.9C9.7,12,10,12.5,10,13.2c0,1.1,0,1.9,0,2.2
-               c0.4,1.1,0.2,1.9,0.1,2.1c0.5,0.6,0.8,1.3,0.8,2.1c0,3.1-1.9,3.7-3.7,3.9C9.7,12,10,12.5,10,13.2c0,1.1,0,1.9,0,2.2
+            c0,0.2,0.1,0.5,0.6,0.4c3.2-1.1,5.5-4.1,5.5-7.6C16,3.8,12.4,0.2,8,0.2z"
-               c0,0.2,0.1,0.5,0.6,0.4c3.2-1.1,5.5-4.1,5.5-7.6C16,3.8,12.4,0.2,8,0.2z"
+                            ></path>
-                                ></path>
+                        </svg>
-                            </svg>
+                        Download on GitHub
-                            Download on GitHub
+                    </a>
                        </a>
                    </span>
                </div>
            </header>
@@ -256,23 +265,13 @@
                <a
                    href="https://twitter.com/intent/tweet?text=A+simple+HTML5+media+player+with+custom+controls+and+WebVTT+captions.&amp;url=http%3A%2F%2Fplyr.io&amp;via=Sam_Potts"
                    target="_blank"
-                    class="js-shr-button"
+                    class="js-shr"
                    >tweet it</a
                >
                👍
            </p>
        </aside>
        <!-- Polyfills -->
        <script
            src="https://cdn.polyfill.io/v3/polyfill.min.js?features=es6,Array.prototype.includes,CustomEvent,Object.entries,Object.values,URL,Math.trunc&flags=gated"
            crossorigin="anonymous"
        ></script>
        <!-- Sharing libary (https://shr.one) -->
        <script src="https://cdn.shr.one/2.0.0-beta.2/shr.js" crossorigin="anonymous"></script>
        <!-- Docs script -->
        <script src="dist/demo.js" crossorigin="anonymous"></script>
    </body>
 </html>
@@ -0,0 +1,14 @@
 {
    "name": "plyr-demo",
    "version": "1.0.0",
    "description": "Demo for Plyr",
    "homepage": "https://plyr.io",
    "author": "Sam Potts <sam@potts.es>",
    "dependencies": {
        "core-js": "^3.1.4",
        "custom-event-polyfill": "^1.0.7",
        "raven-js": "^3.27.2",
        "shr-buttons": "2.0.3",
        "url-polyfill": "^1.1.5"
    }
 }
@@ -4,8 +4,16 @@
 // Please see readme.md in the root or github.com/sampotts/plyr
 // ==========================================================================
 import './tab-focus';
 import 'custom-event-polyfill';
 import 'url-polyfill';
 import Raven from 'raven-js';
 import Shr from 'shr-buttons';
 import Plyr from '../../../src/js/plyr';
 import sources from './sources';
 import toggleClass from './toggle-class';
 (() => {
    const { host } = window.location;
@@ -17,45 +25,15 @@ import Plyr from '../../../src/js/plyr';
    document.addEventListener('DOMContentLoaded', () => {
        Raven.context(() => {
            const selector = '#player';
            const container = document.getElementById('container');
-            if (window.Shr) {
+            // Setup share buttons
-                window.Shr.setup('.js-shr-button', {
+            Shr.setup('.js-shr', {
-                    count: {
+                count: {
-                        classname: 'button__count',
+                    className: 'button__count',
-                    },
+                },
-                });
+                wrapper: {
-            }
+                    className: 'button--with-count',
-
+                },
            // Setup tab focus
            const tabClassName = 'tab-focus';
            // Remove class on blur
            document.addEventListener('focusout', event => {
                if (!event.target.classList || container.contains(event.target)) {
                    return;
                }
                event.target.classList.remove(tabClassName);
            });
            // Add classname to tabbed elements
            document.addEventListener('keydown', event => {
                if (event.keyCode !== 9) {
                    return;
                }
                // Delay the adding of classname until the focus has changed
                // This event fires before the focusin event
                setTimeout(() => {
                    const focused = document.activeElement;
                    if (!focused || !focused.classList || container.contains(focused)) {
                        return;
                    }
                    focused.classList.add(tabClassName);
                }, 10);
            });
            // Setup the player
@@ -93,131 +71,12 @@ import Plyr from '../../../src/js/plyr';
            // Setup type toggle
            const buttons = document.querySelectorAll('[data-source]');
-            const types = {
+            const types = Object.keys(sources);
-                video: 'video',
+            const historySupport = Boolean(window.history && window.history.pushState);
-                audio: 'audio',
+            let currentType = window.location.hash.substring(1);
-                youtube: 'youtube',
+            const hasCurrentType = !currentType.length;
                vimeo: 'vimeo',
            };
            let currentType = window.location.hash.replace('#', '');
            const historySupport = window.history && window.history.pushState;
            // Toggle class on an element
            function toggleClass(element, className, state) {
                if (element) {
                    element.classList[state ? 'add' : 'remove'](className);
                }
            }
            // Set a new source
            function newSource(type, init) {
                // Bail if new type isn't known, it's the current type, or current type is empty (video is default) and new type is video
                if (
                    !(type in types) ||
                    (!init && type === currentType) ||
                    (!currentType.length && type === types.video)
                ) {
                    return;
                }
                switch (type) {
                    case types.video:
                        player.source = {
                            type: 'video',
                            title: 'View From A Blue Moon',
                            sources: [
                                {
                                    src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4',
                                    type: 'video/mp4',
                                    size: 576,
                                },
                                {
                                    src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-720p.mp4',
                                    type: 'video/mp4',
                                    size: 720,
                                },
                                {
                                    src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1080p.mp4',
                                    type: 'video/mp4',
                                    size: 1080,
                                },
                                {
                                    src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1440p.mp4',
                                    type: 'video/mp4',
                                    size: 1440,
                                },
                            ],
                            poster: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg',
                            tracks: [
                                {
                                    kind: 'captions',
                                    label: 'English',
                                    srclang: 'en',
                                    src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt',
                                    default: true,
                                },
                                {
                                    kind: 'captions',
                                    label: 'French',
                                    srclang: 'fr',
                                    src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.fr.vtt',
                                },
                            ],
                        };
                        break;
                    case types.audio:
                        player.source = {
                            type: 'audio',
                            title: 'Kishi Bashi &ndash; &ldquo;It All Began With A Burst&rdquo;',
                            sources: [
                                {
                                    src: 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3',
                                    type: 'audio/mp3',
                                },
                                {
                                    src: 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg',
                                    type: 'audio/ogg',
                                },
                            ],
                        };
                        break;
                    case types.youtube:
                        player.source = {
                            type: 'video',
                            sources: [
                                {
                                    src: 'https://youtube.com/watch?v=bTqVqk7FSmY',
                                    provider: 'youtube',
                                },
                            ],
                        };
                        break;
                    case types.vimeo:
                        player.source = {
                            type: 'video',
                            sources: [
                                {
                                    src: 'https://vimeo.com/76979871',
                                    provider: 'vimeo',
                                },
                            ],
                        };
                        break;
                    default:
                        break;
                }
                // Set the current type for next time
                currentType = type;
            function render(type) {
                // Remove active classes
                Array.from(buttons).forEach(button => toggleClass(button.parentElement, 'active', false));
@@ -226,9 +85,31 @@ import Plyr from '../../../src/js/plyr';
                // Show cite
                Array.from(document.querySelectorAll('.plyr__cite')).forEach(cite => {
-                    cite.setAttribute('hidden', '');
+                    // eslint-disable-next-line no-param-reassign
                    cite.hidden = true;
                });
-                document.querySelector(`.plyr__cite--${type}`).removeAttribute('hidden');
+
                document.querySelector(`.plyr__cite--${type}`).hidden = false;
            }
            // Set a new source
            function setSource(type, init) {
                // Bail if new type isn't known, it's the current type, or current type is empty (video is default) and new type is video
                if (
                    !types.includes(type) ||
                    (!init && type === currentType) ||
                    (!currentType.length && type === 'video')
                ) {
                    return;
                }
                // Set the new source
                player.source = sources[type];
                // Set the current type for next time
                currentType = type;
                render(type);
            }
            // Bind to each button
@@ -236,7 +117,7 @@ import Plyr from '../../../src/js/plyr';
                button.addEventListener('click', () => {
                    const type = button.getAttribute('data-source');
-                    newSource(type);
+                    setSource(type);
                    if (historySupport) {
                        window.history.pushState({ type }, '', `#${type}`);
@@ -246,36 +127,27 @@ import Plyr from '../../../src/js/plyr';
            // List for backwards/forwards
            window.addEventListener('popstate', event => {
-                if (event.state && 'type' in event.state) {
+                if (event.state && Object.keys(event.state).includes('type')) {
-                    newSource(event.state.type);
+                    setSource(event.state.type);
                }
            });
-            // On load
+            // If there's no current type set, assume video
-            if (historySupport) {
+            if (hasCurrentType) {
-                const video = !currentType.length;
+                currentType = 'video';
                // If there's no current type set, assume video
                if (video) {
                    currentType = types.video;
                }
                // Replace current history state
                if (currentType in types) {
                    window.history.replaceState(
                        {
                            type: currentType,
                        },
                        '',
                        video ? '' : `#${currentType}`,
                    );
                }
                // If it's not video, load the source
                if (currentType !== types.video) {
                    newSource(currentType, true);
                }
            }
            // Replace current history state
            if (historySupport && types.includes(currentType)) {
                window.history.replaceState({ type: currentType }, '', hasCurrentType ? '' : `#${currentType}`);
            }
            // If it's not video, load the source
            if (currentType !== 'video') {
                setSource(currentType, true);
            }
            render(currentType);
        });
    });
@@ -0,0 +1,78 @@
 const sources = {
    video: {
        type: 'video',
        title: 'View From A Blue Moon',
        sources: [
            {
                src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4',
                type: 'video/mp4',
                size: 576,
            },
            {
                src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-720p.mp4',
                type: 'video/mp4',
                size: 720,
            },
            {
                src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1080p.mp4',
                type: 'video/mp4',
                size: 1080,
            },
            {
                src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1440p.mp4',
                type: 'video/mp4',
                size: 1440,
            },
        ],
        poster: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg',
        tracks: [
            {
                kind: 'captions',
                label: 'English',
                srclang: 'en',
                src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt',
                default: true,
            },
            {
                kind: 'captions',
                label: 'French',
                srclang: 'fr',
                src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.fr.vtt',
            },
        ],
    },
    audio: {
        type: 'audio',
        title: 'Kishi Bashi &ndash; &ldquo;It All Began With A Burst&rdquo;',
        sources: [
            {
                src: 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3',
                type: 'audio/mp3',
            },
            {
                src: 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg',
                type: 'audio/ogg',
            },
        ],
    },
    youtube: {
        type: 'video',
        sources: [
            {
                src: 'https://youtube.com/watch?v=bTqVqk7FSmY',
                provider: 'youtube',
            },
        ],
    },
    vimeo: {
        type: 'video',
        sources: [
            {
                src: 'https://vimeo.com/76979871',
                provider: 'vimeo',
            },
        ],
    },
 };
 export default sources;
@@ -0,0 +1,31 @@
 // Setup tab focus
 const container = document.getElementById('container');
 const tabClassName = 'tab-focus';
 // Remove class on blur
 document.addEventListener('focusout', event => {
    if (!event.target.classList || container.contains(event.target)) {
        return;
    }
    event.target.classList.remove(tabClassName);
 });
 // Add classname to tabbed elements
 document.addEventListener('keydown', event => {
    if (event.keyCode !== 9) {
        return;
    }
    // Delay the adding of classname until the focus has changed
    // This event fires before the focusin event
    setTimeout(() => {
        const focused = document.activeElement;
        if (!focused || !focused.classList || container.contains(focused)) {
            return;
        }
        focused.classList.add(tabClassName);
    }, 10);
 });
@@ -0,0 +1,5 @@
 // Toggle class on an element
 const toggleClass = (element, className = '', toggle = false) =>
    element && element.classList[toggle ? 'add' : 'remove'](className);
 export default toggleClass;
@@ -6,11 +6,9 @@
 .button,
 .button__count {
    align-items: center;
    background: $color-button-background;
    border: 0;
    border-radius: $border-radius-base;
    box-shadow: 0 1px 1px rgba(#000, 0.1);
    color: $color-button-text;
    display: inline-flex;
    padding: ($spacing-base * 0.75);
    position: relative;
@@ -21,14 +19,16 @@
 // Buttons
 .button {
    background: $color-button-background;
    color: $color-button-text;
    font-weight: $font-weight-bold;
-    padding-left: $spacing-base;
+    padding-left: ($spacing-base * 1.25);
-    padding-right: $spacing-base;
+    padding-right: ($spacing-base * 1.25);
    transition: all 0.2s ease;
    &:hover,
    &:focus {
-        color: $gray-dark;
+        background: $color-button-background-hover;
        // Remove the underline/border
        &::after {
@@ -38,7 +38,6 @@
    &:hover {
        box-shadow: 0 2px 2px rgba(#000, 0.1);
        transform: translateY(-1px);
    }
    &:focus {
@@ -50,7 +49,7 @@
    }
    &:active {
-        transform: translateY(1px);
+        top: 1px;
    }
 }
@@ -66,12 +65,14 @@
 // Count bubble
 .button__count {
    animation: fadein 0.2s ease;
-    margin-left: ($spacing-base / 2);
+    background: $color-button-count-background;
    color: $color-button-count-text;
    margin-left: ($spacing-base * 0.75);
    &::before {
        border: $arrow-size solid transparent;
        border-left-width: 0;
-        border-right-color: $color-button-background;
+        border-right-color: $color-button-count-background;
        content: '';
        height: 0;
        position: absolute;
@@ -6,6 +6,13 @@ header {
    padding-bottom: $spacing-base;
    text-align: center;
    h1 span {
        animation: shrinkHide 1s cubic-bezier(0.175, 0.885, 0.32, 1.275) 2s forwards;
        display: inline-block;
        font-weight: $font-weight-light;
        opacity: 0.5;
    }
    .call-to-action {
        margin-top: ($spacing-base * 1.5);
    }
@@ -15,5 +22,9 @@ header {
        max-width: 360px;
        padding-bottom: ($spacing-base * 2);
        text-align: left;
        p:first-of-type {
            @include font-size($font-size-base + 1);
        }
    }
 }
@@ -19,5 +19,5 @@ label svg {
 a .icon,
 .btn .icon {
-    margin-right: floor($spacing-base / 3);
+    margin-right: ($spacing-base / 2);
 }
@@ -12,7 +12,6 @@ button.faux-link {
 a {
    border-bottom: 1px dotted currentColor;
    color: $color-link;
    font-weight: $font-weight-bold;
    position: relative;
    text-decoration: none;
    transition: all 0.2s ease;
@@ -2,16 +2,10 @@
 // Examples
 // ==========================================================================
 // For non supported browsers
 video {
    max-width: 100%;
    vertical-align: middle;
 }
 // Example players
 .plyr {
    border-radius: $border-radius-base;
-    box-shadow: 0 2px 5px rgba(#000, 0.2);
+    box-shadow: 0 2px 15px rgba(#000, 0.1);
    margin: $spacing-base auto;
    &.plyr--audio {
@@ -34,17 +28,9 @@ video {
 // Style full supported player
 .plyr__cite {
-    display: none;
+    color: $color-gray-5;
    margin-top: $spacing-base;
    .icon {
        margin-right: ceil($spacing-base / 6);
    }
 }
 .plyr--video:not(.plyr--youtube):not(.plyr--vimeo) ~ ul .plyr__cite--video,
 .plyr--audio ~ ul .plyr__cite--audio,
 .plyr--youtube ~ ul .plyr__cite--youtube,
 .plyr--vimeo ~ ul .plyr__cite--vimeo {
    display: block;
 }
@@ -35,11 +35,10 @@ main {
 aside {
    align-items: center;
    background: #fff;
    color: $gray;
    display: flex;
    flex-shrink: 0;
    justify-content: center;
-    padding: ($spacing-base * 0.75);
+    padding: $spacing-base;
    position: relative;
    text-align: center;
    text-shadow: none;
@@ -11,3 +11,17 @@
        opacity: 1;
    }
 }
@keyframes shrinkHide {
    0% {
        opacity: 0.5;
        width: 38px;
    }
    20% {
        width: 45px;
    }
    100% {
        opacity: 0;
        width: 0;
    }
 }
@@ -36,7 +36,7 @@
    @return #{$rem}rem;
 }
-@mixin font-size($size: 16) {
+@mixin font-size($size: $font-size-base) {
    font-size: $size * 1px; // Fallback in px
    font-size: calculate-rem($size);
 }
@@ -2,31 +2,41 @@
 // Colors
 // ==========================================================================
-// Greyscale
+// Grayscale
-$gray-dark: #343f4a;
+$color-gray-9: hsl(210, 15%, 16%);
-$gray: #55646b;
+$color-gray-8: lighten($color-gray-9, 9%);
-$gray-light: #cbd0d3;
+$color-gray-7: lighten($color-gray-8, 9%);
-$gray-lighter: #dbe3e8;
+$color-gray-6: lighten($color-gray-7, 9%);
-$off-white: #f2f5f7;
+$color-gray-5: lighten($color-gray-6, 9%);
 $color-gray-4: lighten($color-gray-5, 9%);
 $color-gray-3: lighten($color-gray-4, 9%);
 $color-gray-2: lighten($color-gray-3, 9%);
 $color-gray-1: lighten($color-gray-2, 9%);
 $color-gray-0: lighten($color-gray-1, 9%);
 // Branding
 $color-brand-primary: hsl(198, 100%, 50%);
 // Text
-$color-text: #fff;
+$color-text: $color-gray-7;
-
+$color-headings: $color-brand-primary;
 // Plyr
 $color-brand-primary: #1aafff;
 // Brands
 $color-twitter: #4baaf4;
 $color-youtube: #cc181e;
 $color-vimeo: #19b7ed;
 // Elements
-$color-link: #fff;
+$color-link: $color-brand-primary;
-$color-background: $color-brand-primary;
+
 // Background
 $color-background-from: hsl(198, 100%, 94%);
 $color-background-to: hsl(198, 100%, 98%);
 // Buttons
-$color-button-background: #fff;
+$color-button-background: $color-brand-primary;
-$color-button-text: $gray;
+$color-button-text: #fff;
 $color-button-background-hover: hsl(198, 100%, 55%);
 $color-button-count-background: #fff;
 $color-button-count-text: $color-gray-6;
 // Focus
 $tab-focus-default-color: #fff;
@@ -9,4 +9,4 @@ $arrow-size: 5px;
 $border-radius-base: 4px;
 // Background
-$page-background: linear-gradient(to left top, lighten($color-background, 10%), darken($color-background, 20%));
+$page-background: linear-gradient(to left top, $color-background-from, $color-background-to);
@@ -14,6 +14,9 @@ $plyr-font-size-badges: 9px;
 // Other
 $plyr-font-smoothing: true;
 // Colors
 $plyr-color-main: $color-brand-primary;
 // Captions
 $plyr-font-size-captions-base: $plyr-font-size-base;
 $plyr-font-size-captions-small: $plyr-font-size-small;
@@ -2,4 +2,4 @@
 // Colors
 // ==========================================================================
-$spacing-base: 20px;
+$spacing-base: 16px;
@@ -14,7 +14,6 @@ body {
    font-family: $font-sans-serif;
    font-weight: $font-weight-medium;
    line-height: $line-height-base;
    text-shadow: 0 1px 1px rgba(#000, 0.15);
 }
 button,
@@ -26,7 +25,7 @@ textarea {
 p,
 small {
-    margin: 0 0 $spacing-base;
+    margin: 0 0 ($spacing-base * 1.5);
 }
 small {
@@ -4,8 +4,9 @@
 h1 {
    @include font-size($font-size-h1);
    color: $color-headings;
    font-weight: $font-weight-bold;
    letter-spacing: $letter-spacing-headings;
    line-height: 1.2;
-    margin: 0 0 $spacing-base;
+    margin: 0 0 ($spacing-base * 1.5);
 }
@@ -0,0 +1,28 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
 core-js@^3.1.4:
  version "3.1.4"
  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
  integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
 custom-event-polyfill@^1.0.7:
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/custom-event-polyfill/-/custom-event-polyfill-1.0.7.tgz#9bc993ddda937c1a30ccd335614c6c58c4f87aee"
  integrity sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w==
 raven-js@^3.27.2:
  version "3.27.2"
  resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.2.tgz#6c33df952026cd73820aa999122b7b7737a66775"
  integrity sha512-mFWQcXnhRFEQe5HeFroPaEghlnqy7F5E2J3Fsab189ondqUzcjwSVi7el7F36cr6PvQYXoZ1P2F5CSF2/azeMQ==
 shr-buttons@2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/shr-buttons/-/shr-buttons-2.0.3.tgz#2ffd021fc3d789e1510ce2736b938bd09ea1da5a"
  integrity sha512-sPAgHiw4uaIt9TnxTfyZEedDChcldSVtnBHE44cpe/mSC7rqm4IEKZRLYqnVlTcGM+FSDNBPUNpSf50Q2ntd+w==
 url-polyfill@^1.1.5:
  version "1.1.5"
  resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.5.tgz#bec79b72b5407dba6d8cced2e32e4ab273aa9fb1"
  integrity sha512-9XjIJ6nwrU+nGd8t90Ze0Zs7t8A+SU0gqsqPttj6j3zAVe5q0HFcuv37nDBdVSPpi4aTHTfbUF/i+ZVD+o2EbA==
@@ -540,6 +540,49 @@ typeof navigator === "object" && (function (global, factory) {
    empty: isEmpty$1
  };
  // ==========================================================================
  var transitionEndEvent = function () {
    var element = document.createElement('span');
    var events = {
      WebkitTransition: 'webkitTransitionEnd',
      MozTransition: 'transitionend',
      OTransition: 'oTransitionEnd otransitionend',
      transition: 'transitionend'
    };
    var type = Object.keys(events).find(function (event) {
      return element.style[event] !== undefined;
    });
    return is$1.string(type) ? events[type] : false;
  }(); // Force repaint of element
  function repaint(element, delay) {
    setTimeout(function () {
      try {
        // eslint-disable-next-line no-param-reassign
        element.hidden = true; // eslint-disable-next-line no-unused-expressions
        element.offsetHeight; // eslint-disable-next-line no-param-reassign
        element.hidden = false;
      } catch (e) {// Do nothing
      }
    }, delay);
  }
  // ==========================================================================
  // Browser sniffing
  // Unfortunately, due to mixed support, UA sniffing is required
  // ==========================================================================
  var browser = {
    isIE:
    /* @cc_on!@ */
    !!document.documentMode,
    isEdge: window.navigator.userAgent.includes('Edge'),
    isWebkit: 'WebkitAppearance' in document.documentElement.style && !/Edge/.test(navigator.userAgent),
    isIPhone: /(iPhone|iPod)/gi.test(navigator.platform),
    isIos: /(iPad|iPhone|iPod)/gi.test(navigator.platform)
  };
  // ==========================================================================
  // https://github.com/WICG/EventListenerOptions/blob/gh-pages/explainer.md
  // https://www.youtube.com/watch?v=NPM6172J22g
@@ -903,13 +946,10 @@ typeof navigator === "object" && (function (global, factory) {
    if (!is$1.boolean(hide)) {
      hide = !element.hidden;
-    }
+    } // eslint-disable-next-line no-param-reassign
-    if (hide) {
+
-      element.setAttribute('hidden', '');
+    element.hidden = hide;
    } else {
      element.removeAttribute('hidden');
    }
  } // Mirror Element.classList.toggle, with IE compatibility for "force" argument
  function toggleClass(element, className, force) {
@@ -943,8 +983,8 @@ typeof navigator === "object" && (function (global, factory) {
      return Array.from(document.querySelectorAll(selector)).includes(this);
    }
-    var matches = match;
+    var method = match;
-    return matches.call(element, selector);
+    return method.call(element, selector);
  } // Find all elements
  function getElements(selector) {
@@ -1008,47 +1048,6 @@ typeof navigator === "object" && (function (global, factory) {
    }
  }
  // ==========================================================================
  var transitionEndEvent = function () {
    var element = document.createElement('span');
    var events = {
      WebkitTransition: 'webkitTransitionEnd',
      MozTransition: 'transitionend',
      OTransition: 'oTransitionEnd otransitionend',
      transition: 'transitionend'
    };
    var type = Object.keys(events).find(function (event) {
      return element.style[event] !== undefined;
    });
    return is$1.string(type) ? events[type] : false;
  }(); // Force repaint of element
  function repaint(element) {
    setTimeout(function () {
      try {
        toggleHidden(element, true);
        element.offsetHeight; // eslint-disable-line
        toggleHidden(element, false);
      } catch (e) {// Do nothing
      }
    }, 0);
  }
  // ==========================================================================
  // Browser sniffing
  // Unfortunately, due to mixed support, UA sniffing is required
  // ==========================================================================
  var browser = {
    isIE:
    /* @cc_on!@ */
    !!document.documentMode,
    isEdge: window.navigator.userAgent.includes('Edge'),
    isWebkit: 'WebkitAppearance' in document.documentElement.style && !/Edge/.test(navigator.userAgent),
    isIPhone: /(iPhone|iPod)/gi.test(navigator.platform),
    isIos: /(iPad|iPhone|iPod)/gi.test(navigator.platform)
  };
  var defaultCodecs = {
    'audio/ogg': 'vorbis',
    'audio/wav': '1',
@@ -1172,12 +1171,8 @@ typeof navigator === "object" && (function (global, factory) {
  }
  function getAspectRatio(input) {
    var parse = function parse(ratio) {
-      if (!validateRatio(ratio)) {
+      return validateRatio(ratio) ? ratio.split(':').map(Number) : null;
-        return null;
+    }; // Try provided ratio
      }
      return ratio.split(':').map(Number);
    }; // Provided ratio
    var ratio = parse(input); // Get from config
@@ -1264,16 +1259,19 @@ typeof navigator === "object" && (function (global, factory) {
        return;
      }
-      var player = this; // Set aspect ratio if set
+      var player = this; // Set aspect ratio if fixed
      if (!is$1.empty(this.config.ratio)) {
        setAspectRatio.call(player);
      } // Quality
      setAspectRatio.call(player); // Quality
      Object.defineProperty(player.media, 'quality', {
        get: function get() {
          // Get sources
          var sources = html5.getSources.call(player);
-          var source = sources.find(function (source) {
+          var source = sources.find(function (s) {
-            return source.getAttribute('src') === player.source;
+            return s.getAttribute('src') === player.source;
          }); // Return size, if match is found
          return source && Number(source.getAttribute('size'));
@@ -1282,8 +1280,8 @@ typeof navigator === "object" && (function (global, factory) {
          // Get sources
          var sources = html5.getSources.call(player); // Get first match for requested size
-          var source = sources.find(function (source) {
+          var source = sources.find(function (s) {
-            return Number(source.getAttribute('size')) === input;
+            return Number(s.getAttribute('size')) === input;
          }); // No matching source found
          if (!source) {
@@ -1473,10 +1471,10 @@ typeof navigator === "object" && (function (global, factory) {
      };
      Object.entries(replace).forEach(function (_ref) {
        var _ref2 = _slicedToArray(_ref, 2),
-            key = _ref2[0],
+            k = _ref2[0],
-            value = _ref2[1];
+            v = _ref2[1];
-        string = replaceAll(string, key, value);
+        string = replaceAll(string, k, v);
      });
      return string;
    }
@@ -1611,6 +1609,7 @@ typeof navigator === "object" && (function (global, factory) {
    };
    var update = function update(container, data) {
      // eslint-disable-next-line no-param-reassign
      container.innerHTML = data; // Check again incase of race condition
      if (hasId && exists()) {
@@ -2085,9 +2084,9 @@ typeof navigator === "object" && (function (global, factory) {
        get: function get() {
          return menuItem.getAttribute('aria-checked') === 'true';
        },
-        set: function set(checked) {
+        set: function set(check) {
          // Ensure exclusivity
-          if (checked) {
+          if (check) {
            Array.from(menuItem.parentNode.children).filter(function (node) {
              return matches$1(node, '[role="menuitemradio"]');
            }).forEach(function (node) {
@@ -2095,7 +2094,7 @@ typeof navigator === "object" && (function (global, factory) {
            });
          }
-          menuItem.setAttribute('aria-checked', checked ? 'true' : 'false');
+          menuItem.setAttribute('aria-checked', check ? 'true' : 'false');
        }
      });
      this.listeners.bind(menuItem, 'click keyup', function (event) {
@@ -2197,16 +2196,16 @@ typeof navigator === "object" && (function (global, factory) {
      var value = 0;
      var setProgress = function setProgress(target, input) {
-        var value = is$1.number(input) ? input : 0;
+        var val = is$1.number(input) ? input : 0;
        var progress = is$1.element(target) ? target : _this4.elements.display.buffer; // Update value and label
        if (is$1.element(progress)) {
-          progress.value = value; // Update text label inside
+          progress.value = val; // Update text label inside
          var label = progress.getElementsByTagName('span')[0];
          if (is$1.element(label)) {
-            label.childNodes[0].nodeValue = value;
+            label.childNodes[0].nodeValue = val;
          }
        }
      };
@@ -2275,15 +2274,12 @@ typeof navigator === "object" && (function (global, factory) {
      // Bail if setting not true
      if (!this.config.tooltips.seek || !is$1.element(this.elements.inputs.seek) || !is$1.element(this.elements.display.seekTooltip) || this.duration === 0) {
        return;
-      } // Calculate percentage
+      }
      var percent = 0;
      var clientRect = this.elements.progress.getBoundingClientRect();
      var visible = "".concat(this.config.classNames.tooltip, "--visible");
-      var toggle = function toggle(_toggle) {
+      var toggle = function toggle(show) {
-        toggleClass(_this5.elements.display.seekTooltip, visible, _toggle);
+        return toggleClass(_this5.elements.display.seekTooltip, visible, show);
      }; // Hide on touch
@@ -2293,6 +2289,9 @@ typeof navigator === "object" && (function (global, factory) {
      } // Determine percentage, if already visible
      var percent = 0;
      var clientRect = this.elements.progress.getBoundingClientRect();
      if (is$1.event(event)) {
        percent = 100 / clientRect.width * (event.pageX - clientRect.left);
      } else if (hasClass(this.elements.display.seekTooltip, visible)) {
@@ -2653,8 +2652,8 @@ typeof navigator === "object" && (function (global, factory) {
      var target = pane;
      if (!is$1.element(target)) {
-        target = Object.values(this.elements.settings.panels).find(function (pane) {
+        target = Object.values(this.elements.settings.panels).find(function (p) {
-          return !pane.hidden;
+          return !p.hidden;
        });
      }
@@ -2909,17 +2908,15 @@ typeof navigator === "object" && (function (global, factory) {
        if (control === 'settings' && !is$1.empty(_this10.config.settings)) {
-          var _control = createElement('div', extend({}, defaultAttributes, {
+          var wrapper = createElement('div', extend({}, defaultAttributes, {
            class: "".concat(defaultAttributes.class, " plyr__menu").trim(),
            hidden: ''
          }));
-
+          wrapper.appendChild(createButton.call(_this10, 'settings', {
          _control.appendChild(createButton.call(_this10, 'settings', {
            'aria-haspopup': true,
            'aria-controls': "plyr-settings-".concat(data.id),
            'aria-expanded': false
          }));
          var popup = createElement('div', {
            class: 'plyr__menu__container',
            id: "plyr-settings-".concat(data.id),
@@ -3008,12 +3005,10 @@ typeof navigator === "object" && (function (global, factory) {
          });
          popup.appendChild(inner);
-
+          wrapper.appendChild(popup);
-          _control.appendChild(popup);
+          container.appendChild(wrapper);
          container.appendChild(_control);
          _this10.elements.settings.popup = popup;
-          _this10.elements.settings.menu = _control;
+          _this10.elements.settings.menu = wrapper;
        } // Picture in picture button
@@ -3344,6 +3339,7 @@ typeof navigator === "object" && (function (global, factory) {
          meta.set(track, {
            default: track.mode === 'showing'
          }); // Turn off native caption rendering to avoid double captions
          // eslint-disable-next-line no-param-reassign
          track.mode = 'hidden'; // Add event listener for cue changes
@@ -3525,8 +3521,8 @@ typeof navigator === "object" && (function (global, factory) {
      });
      var track;
      languages.every(function (language) {
-        track = sorted.find(function (track) {
+        track = sorted.find(function (t) {
-          return track.language === language;
+          return t.language === language;
        });
        return !track; // Break iteration if there is a match
      }); // If no match is found but is required, get first
@@ -3650,7 +3646,7 @@ typeof navigator === "object" && (function (global, factory) {
    // Sprite (for icons)
    loadSprite: true,
    iconPrefix: 'plyr',
-    iconUrl: 'https://cdn.plyr.io/3.5.4/plyr.svg',
+    iconUrl: 'https://cdn.plyr.io/3.5.6/plyr.svg',
    // Blank video (used to prevent errors on source change)
    blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
    // Quality default
@@ -3705,7 +3701,8 @@ typeof navigator === "object" && (function (global, factory) {
    controls: ['play-large', // 'restart',
    // 'rewind',
    'play', // 'fast-forward',
-    'progress', 'current-time', 'mute', 'volume', 'captions', 'settings', 'pip', 'airplay', // 'download',
+    'progress', 'current-time', // 'duration',
    'mute', 'volume', 'captions', 'settings', 'pip', 'airplay', // 'download',
    'fullscreen'],
    settings: ['captions', 'quality', 'speed'],
    // Localisation
@@ -3763,8 +3760,7 @@ typeof navigator === "object" && (function (global, factory) {
      },
      youtube: {
        sdk: 'https://www.youtube.com/iframe_api',
-        api: 'https://noembed.com/embed?url=https://www.youtube.com/watch?v={0}' // 'https://www.googleapis.com/youtube/v3/videos?id={0}&key={1}&fields=items(snippet(title),fileDetails)&part=snippet',
+        api: 'https://noembed.com/embed?url=https://www.youtube.com/watch?v={0}'
      },
      googleIMA: {
        sdk: 'https://imasdk.googleapis.com/js/sdkloader/ima3.js'
@@ -4049,8 +4045,6 @@ typeof navigator === "object" && (function (global, factory) {
  }
  function toggleFallback() {
    var _this = this;
    var toggle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
    // Store or restore scroll position
@@ -4090,12 +4084,7 @@ typeof navigator === "object" && (function (global, factory) {
        viewport.content = viewport.content.split(',').filter(function (part) {
          return part.trim() !== property;
        }).join(',');
-      } // Force a repaint as sometimes Safari doesn't want to fill the screen
+      }
      setTimeout(function () {
        return repaint(_this.target);
      }, 100);
    } // Toggle button and fire events
@@ -4106,7 +4095,7 @@ typeof navigator === "object" && (function (global, factory) {
  /*#__PURE__*/
  function () {
    function Fullscreen(player) {
-      var _this2 = this;
+      var _this = this;
      _classCallCheck(this, Fullscreen);
@@ -4126,16 +4115,16 @@ typeof navigator === "object" && (function (global, factory) {
      on.call(this.player, document, this.prefix === 'ms' ? 'MSFullscreenChange' : "".concat(this.prefix, "fullscreenchange"), function () {
        // TODO: Filter for target??
-        onChange.call(_this2);
+        onChange.call(_this);
      }); // Fullscreen toggle on double click
      on.call(this.player, this.player.elements.container, 'dblclick', function (event) {
        // Ignore double click in controls
-        if (is$1.element(_this2.player.elements.controls) && _this2.player.elements.controls.contains(event.target)) {
+        if (is$1.element(_this.player.elements.controls) && _this.player.elements.controls.contains(event.target)) {
          return;
        }
-        _this2.toggle();
+        _this.toggle();
      }); // Update the UI
      this.update();
@@ -4483,7 +4472,9 @@ typeof navigator === "object" && (function (global, factory) {
      toggleClass(this.elements.container, this.config.classNames.stopped, this.stopped); // Set state
      Array.from(this.elements.buttons.play || []).forEach(function (target) {
-        target.pressed = _this3.playing;
+        Object.assign(target, {
          pressed: _this3.playing
        });
      }); // Only update controls on non timeupdate events
      if (is$1.event(event) && event.type === 'timeupdate') {
@@ -4510,13 +4501,13 @@ typeof navigator === "object" && (function (global, factory) {
    },
    // Toggle controls based on state and `force` argument
    toggleControls: function toggleControls(force) {
-      var controls = this.elements.controls;
+      var controlsElement = this.elements.controls;
-      if (controls && this.config.hideControls) {
+      if (controlsElement && this.config.hideControls) {
        // Don't hide controls if a touch-device user recently seeked. (Must be limited to touch devices, or it occasionally prevents desktop controls from hiding.)
        var recentTouchSeek = this.touch && this.lastSeekTime + 2000 > Date.now(); // Show controls if force, loading, paused, button interaction, or recent seek, otherwise hide
-        this.toggleControls(Boolean(force || this.loading || this.paused || controls.pressed || controls.hover || recentTouchSeek));
+        this.toggleControls(Boolean(force || this.loading || this.paused || controlsElement.pressed || controlsElement.hover || recentTouchSeek));
      }
    }
  };
@@ -4666,14 +4657,14 @@ typeof navigator === "object" && (function (global, factory) {
              break;
            /* case 73:
-            this.setLoop('start');
+                this.setLoop('start');
-            break;
+                break;
-            case 76:
+             case 76:
-            this.setLoop();
+                this.setLoop();
-            break;
+                break;
-            case 79:
+             case 79:
-            this.setLoop('end');
+                this.setLoop('end');
-            break; */
+                break; */
            default:
              break;
@@ -4784,11 +4775,11 @@ typeof navigator === "object" && (function (global, factory) {
        on.call(player, elements.container, 'mousemove mouseleave touchstart touchmove enterfullscreen exitfullscreen', function (event) {
-          var controls = elements.controls; // Remove button states for fullscreen
+          var controlsElement = elements.controls; // Remove button states for fullscreen
-          if (controls && event.type === 'enterfullscreen') {
+          if (controlsElement && event.type === 'enterfullscreen') {
-            controls.pressed = false;
+            controlsElement.pressed = false;
-            controls.hover = false;
+            controlsElement.hover = false;
          } // Show, then hide after a timeout unless another control event occurs
@@ -4807,15 +4798,7 @@ typeof navigator === "object" && (function (global, factory) {
          timers.controls = setTimeout(function () {
            return ui.toggleControls.call(player, false);
          }, delay);
-        }); // Force edge to repaint on exit fullscreen
+        }); // Set a gutter for Vimeo
        // TODO: Fix weird bug where Edge doesn't re-draw when exiting fullscreen
        /* if (browser.isEdge) {
            on.call(player, elements.container, 'exitfullscreen', () => {
                setTimeout(() => repaint(elements.container), 100);
            });
        } */
        // Set a gutter for Vimeo
        var setGutter = function setGutter(ratio, padding, toggle) {
          if (!player.isVimeo) {
@@ -4850,16 +4833,21 @@ typeof navigator === "object" && (function (global, factory) {
        };
        var resized = function resized() {
-          window.clearTimeout(timers.resized);
+          clearTimeout(timers.resized);
-          timers.resized = window.setTimeout(setPlayerSize, 50);
+          timers.resized = setTimeout(setPlayerSize, 50);
        };
        on.call(player, elements.container, 'enterfullscreen exitfullscreen', function (event) {
          var _player$fullscreen = player.fullscreen,
              target = _player$fullscreen.target,
-              usingNative = _player$fullscreen.usingNative; // Ignore for iOS native
+              usingNative = _player$fullscreen.usingNative; // Ignore events not from target
-          if (!player.isEmbed || target !== elements.container) {
+          if (target !== elements.container) {
            return;
          } // If it's not an embed and no ratio specified
          if (!player.isEmbed && is$1.empty(player.config.ratio)) {
            return;
          }
@@ -5253,7 +5241,6 @@ typeof navigator === "object" && (function (global, factory) {
        this.bind(elements.controls, 'focusin', function () {
          var config = player.config,
              elements = player.elements,
              timers = player.timers; // Skip transition to prevent focus from scrolling the parent element
          toggleClass(elements.controls, config.classNames.noTransition, true); // Toggle
@@ -5995,23 +5982,22 @@ typeof navigator === "object" && (function (global, factory) {
      if (is$1.object(window.YT) && is$1.function(window.YT.Player)) {
        youtube.ready.call(this);
      } else {
-        // Load the API
+        // Reference current global callback
-        loadScript(this.config.urls.youtube.sdk).catch(function (error) {
+        var callback = window.onYouTubeIframeAPIReady; // Set callback to process queue
          _this.debug.warn('YouTube API failed to load', error);
        }); // Setup callback for the API
        // YouTube has it's own system of course...
        window.onYouTubeReadyCallbacks = window.onYouTubeReadyCallbacks || []; // Add to queue
        window.onYouTubeReadyCallbacks.push(function () {
          youtube.ready.call(_this);
        }); // Set callback to process queue
        window.onYouTubeIframeAPIReady = function () {
-          window.onYouTubeReadyCallbacks.forEach(function (callback) {
+          // Call global callback if set
          if (is$1.function(callback)) {
            callback();
-          });
+          }
-        };
+
          youtube.ready.call(_this);
        }; // Load the SDK
        loadScript(this.config.urls.youtube.sdk).catch(function (error) {
          _this.debug.warn('YouTube API failed to load', error);
        });
      }
    },
    // Get the media title
@@ -6041,7 +6027,7 @@ typeof navigator === "object" && (function (global, factory) {
    ready: function ready() {
      var player = this; // Ignore already setup (race condition)
-      var currentId = player.media.getAttribute('id');
+      var currentId = player.media && player.media.getAttribute('id');
      if (!is$1.empty(currentId) && currentId.startsWith('youtube-')) {
        return;
@@ -6066,8 +6052,8 @@ typeof navigator === "object" && (function (global, factory) {
      });
      player.media = replaceElement(container, player.media); // Id to poster wrapper
-      var posterSrc = function posterSrc(format) {
+      var posterSrc = function posterSrc(s) {
-        return "https://i.ytimg.com/vi/".concat(videoId, "/").concat(format, "default.jpg");
+        return "https://i.ytimg.com/vi/".concat(videoId, "/").concat(s, "default.jpg");
      }; // Check thumbnail images in order of quality, but reject fallback thumbnails (120px wide)
@@ -6080,9 +6066,9 @@ typeof navigator === "object" && (function (global, factory) {
      }) // 360p padded 4:3. Always exists
      .then(function (image) {
        return ui.setPoster.call(player, image.src);
-      }).then(function (posterSrc) {
+      }).then(function (src) {
        // If the image is padded, use background-size "cover" instead (like youtube does too with their posters)
-        if (!posterSrc.includes('maxres')) {
+        if (!src.includes('maxres')) {
          player.elements.poster.style.backgroundSize = 'cover';
        }
      }).catch(function () {});
@@ -6623,8 +6609,8 @@ typeof navigator === "object" && (function (global, factory) {
        }); // Advertisement regular events
        Object.keys(google.ima.AdEvent.Type).forEach(function (type) {
-          _this6.manager.addEventListener(google.ima.AdEvent.Type[type], function (event) {
+          _this6.manager.addEventListener(google.ima.AdEvent.Type[type], function (e) {
-            return _this6.onAdEvent(event);
+            return _this6.onAdEvent(e);
          });
        }); // Resolve our adsManager
@@ -6672,8 +6658,7 @@ typeof navigator === "object" && (function (global, factory) {
        var adData = event.getAdData(); // Proxy event
        var dispatchEvent = function dispatchEvent(type) {
-          var event = "ads".concat(type.replace(/_/g, '').toLowerCase());
+          triggerEvent.call(_this8.player, _this8.player.media, "ads".concat(type.replace(/_/g, '').toLowerCase()));
          triggerEvent.call(_this8.player, _this8.player.media, event);
        }; // Bubble the event
@@ -7129,7 +7114,11 @@ typeof navigator === "object" && (function (global, factory) {
        }
        this.getThumbnails().then(function () {
-          // Render DOM elements
+          if (!_this.enabled) {
            return;
          } // Render DOM elements
          _this.render(); // Check to see if thumb container size was specified manually in CSS
@@ -7464,6 +7453,7 @@ typeof navigator === "object" && (function (global, factory) {
          if (image.dataset.index !== currentImage.dataset.index && !image.dataset.deleting) {
            // Wait 200ms, as the new image can take some time to show on certain browsers (even though it was downloaded before showing). This will prevent flicker, and show some generosity towards slower clients
            // First set attribute 'deleting' to prevent multi-handling of this on repeat firing of this function
            // eslint-disable-next-line no-param-reassign
            image.dataset.deleting = true; // This has to be set before the timeout - to prevent issues switching between hover and scrub
            var currentImageContainer = _this8.currentImageContainer;
@@ -7642,10 +7632,14 @@ typeof navigator === "object" && (function (global, factory) {
        } // Find difference between height and preview container height
-        var multiplier = this.thumbContainerHeight / frame.h;
+        var multiplier = this.thumbContainerHeight / frame.h; // eslint-disable-next-line no-param-reassign
-        previewImage.style.height = "".concat(Math.floor(previewImage.naturalHeight * multiplier), "px");
+
-        previewImage.style.width = "".concat(Math.floor(previewImage.naturalWidth * multiplier), "px");
+        previewImage.style.height = "".concat(Math.floor(previewImage.naturalHeight * multiplier), "px"); // eslint-disable-next-line no-param-reassign
-        previewImage.style.left = "-".concat(frame.x * multiplier, "px");
+
        previewImage.style.width = "".concat(Math.floor(previewImage.naturalWidth * multiplier), "px"); // eslint-disable-next-line no-param-reassign
        previewImage.style.left = "-".concat(frame.x * multiplier, "px"); // eslint-disable-next-line no-param-reassign
        previewImage.style.top = "-".concat(frame.y * multiplier, "px");
      }
    }, {
@@ -8477,32 +8471,32 @@ typeof navigator === "object" && (function (global, factory) {
    }, {
      key: "isHTML5",
      get: function get() {
-        return Boolean(this.provider === providers.html5);
+        return this.provider === providers.html5;
      }
    }, {
      key: "isEmbed",
      get: function get() {
-        return Boolean(this.isYouTube || this.isVimeo);
+        return this.isYouTube || this.isVimeo;
      }
    }, {
      key: "isYouTube",
      get: function get() {
-        return Boolean(this.provider === providers.youtube);
+        return this.provider === providers.youtube;
      }
    }, {
      key: "isVimeo",
      get: function get() {
-        return Boolean(this.provider === providers.vimeo);
+        return this.provider === providers.vimeo;
      }
    }, {
      key: "isVideo",
      get: function get() {
-        return Boolean(this.type === types.video);
+        return this.type === types.video;
      }
    }, {
      key: "isAudio",
      get: function get() {
-        return Boolean(this.type === types.audio);
+        return this.type === types.audio;
      }
    }, {
      key: "playing",
@@ -534,6 +534,49 @@ var is$1 = {
  empty: isEmpty$1
 };
 // ==========================================================================
 var transitionEndEvent = function () {
  var element = document.createElement('span');
  var events = {
    WebkitTransition: 'webkitTransitionEnd',
    MozTransition: 'transitionend',
    OTransition: 'oTransitionEnd otransitionend',
    transition: 'transitionend'
  };
  var type = Object.keys(events).find(function (event) {
    return element.style[event] !== undefined;
  });
  return is$1.string(type) ? events[type] : false;
 }(); // Force repaint of element
 function repaint(element, delay) {
  setTimeout(function () {
    try {
      // eslint-disable-next-line no-param-reassign
      element.hidden = true; // eslint-disable-next-line no-unused-expressions
      element.offsetHeight; // eslint-disable-next-line no-param-reassign
      element.hidden = false;
    } catch (e) {// Do nothing
    }
  }, delay);
 }
 // ==========================================================================
 // Browser sniffing
 // Unfortunately, due to mixed support, UA sniffing is required
 // ==========================================================================
 var browser = {
  isIE:
  /* @cc_on!@ */
  !!document.documentMode,
  isEdge: window.navigator.userAgent.includes('Edge'),
  isWebkit: 'WebkitAppearance' in document.documentElement.style && !/Edge/.test(navigator.userAgent),
  isIPhone: /(iPhone|iPod)/gi.test(navigator.platform),
  isIos: /(iPad|iPhone|iPod)/gi.test(navigator.platform)
 };
 // ==========================================================================
 // https://github.com/WICG/EventListenerOptions/blob/gh-pages/explainer.md
 // https://www.youtube.com/watch?v=NPM6172J22g
@@ -897,13 +940,10 @@ function toggleHidden(element, hidden) {
  if (!is$1.boolean(hide)) {
    hide = !element.hidden;
-  }
+  } // eslint-disable-next-line no-param-reassign
-  if (hide) {
+
-    element.setAttribute('hidden', '');
+  element.hidden = hide;
  } else {
    element.removeAttribute('hidden');
  }
 } // Mirror Element.classList.toggle, with IE compatibility for "force" argument
 function toggleClass(element, className, force) {
@@ -937,8 +977,8 @@ function matches$1(element, selector) {
    return Array.from(document.querySelectorAll(selector)).includes(this);
  }
-  var matches = match;
+  var method = match;
-  return matches.call(element, selector);
+  return method.call(element, selector);
 } // Find all elements
 function getElements(selector) {
@@ -1002,47 +1042,6 @@ function setFocus() {
  }
 }
 // ==========================================================================
 var transitionEndEvent = function () {
  var element = document.createElement('span');
  var events = {
    WebkitTransition: 'webkitTransitionEnd',
    MozTransition: 'transitionend',
    OTransition: 'oTransitionEnd otransitionend',
    transition: 'transitionend'
  };
  var type = Object.keys(events).find(function (event) {
    return element.style[event] !== undefined;
  });
  return is$1.string(type) ? events[type] : false;
 }(); // Force repaint of element
 function repaint(element) {
  setTimeout(function () {
    try {
      toggleHidden(element, true);
      element.offsetHeight; // eslint-disable-line
      toggleHidden(element, false);
    } catch (e) {// Do nothing
    }
  }, 0);
 }
 // ==========================================================================
 // Browser sniffing
 // Unfortunately, due to mixed support, UA sniffing is required
 // ==========================================================================
 var browser = {
  isIE:
  /* @cc_on!@ */
  !!document.documentMode,
  isEdge: window.navigator.userAgent.includes('Edge'),
  isWebkit: 'WebkitAppearance' in document.documentElement.style && !/Edge/.test(navigator.userAgent),
  isIPhone: /(iPhone|iPod)/gi.test(navigator.platform),
  isIos: /(iPad|iPhone|iPod)/gi.test(navigator.platform)
 };
 var defaultCodecs = {
  'audio/ogg': 'vorbis',
  'audio/wav': '1',
@@ -1166,12 +1165,8 @@ function reduceAspectRatio(ratio) {
 }
 function getAspectRatio(input) {
  var parse = function parse(ratio) {
-    if (!validateRatio(ratio)) {
+    return validateRatio(ratio) ? ratio.split(':').map(Number) : null;
-      return null;
+  }; // Try provided ratio
    }
    return ratio.split(':').map(Number);
  }; // Provided ratio
  var ratio = parse(input); // Get from config
@@ -1258,16 +1253,19 @@ var html5 = {
      return;
    }
-    var player = this; // Set aspect ratio if set
+    var player = this; // Set aspect ratio if fixed
    if (!is$1.empty(this.config.ratio)) {
      setAspectRatio.call(player);
    } // Quality
    setAspectRatio.call(player); // Quality
    Object.defineProperty(player.media, 'quality', {
      get: function get() {
        // Get sources
        var sources = html5.getSources.call(player);
-        var source = sources.find(function (source) {
+        var source = sources.find(function (s) {
-          return source.getAttribute('src') === player.source;
+          return s.getAttribute('src') === player.source;
        }); // Return size, if match is found
        return source && Number(source.getAttribute('size'));
@@ -1276,8 +1274,8 @@ var html5 = {
        // Get sources
        var sources = html5.getSources.call(player); // Get first match for requested size
-        var source = sources.find(function (source) {
+        var source = sources.find(function (s) {
-          return Number(source.getAttribute('size')) === input;
+          return Number(s.getAttribute('size')) === input;
        }); // No matching source found
        if (!source) {
@@ -1467,10 +1465,10 @@ var i18n = {
    };
    Object.entries(replace).forEach(function (_ref) {
      var _ref2 = _slicedToArray(_ref, 2),
-          key = _ref2[0],
+          k = _ref2[0],
-          value = _ref2[1];
+          v = _ref2[1];
-      string = replaceAll(string, key, value);
+      string = replaceAll(string, k, v);
    });
    return string;
  }
@@ -1605,6 +1603,7 @@ function loadSprite(url, id) {
  };
  var update = function update(container, data) {
    // eslint-disable-next-line no-param-reassign
    container.innerHTML = data; // Check again incase of race condition
    if (hasId && exists()) {
@@ -2079,9 +2078,9 @@ var controls = {
      get: function get() {
        return menuItem.getAttribute('aria-checked') === 'true';
      },
-      set: function set(checked) {
+      set: function set(check) {
        // Ensure exclusivity
-        if (checked) {
+        if (check) {
          Array.from(menuItem.parentNode.children).filter(function (node) {
            return matches$1(node, '[role="menuitemradio"]');
          }).forEach(function (node) {
@@ -2089,7 +2088,7 @@ var controls = {
          });
        }
-        menuItem.setAttribute('aria-checked', checked ? 'true' : 'false');
+        menuItem.setAttribute('aria-checked', check ? 'true' : 'false');
      }
    });
    this.listeners.bind(menuItem, 'click keyup', function (event) {
@@ -2191,16 +2190,16 @@ var controls = {
    var value = 0;
    var setProgress = function setProgress(target, input) {
-      var value = is$1.number(input) ? input : 0;
+      var val = is$1.number(input) ? input : 0;
      var progress = is$1.element(target) ? target : _this4.elements.display.buffer; // Update value and label
      if (is$1.element(progress)) {
-        progress.value = value; // Update text label inside
+        progress.value = val; // Update text label inside
        var label = progress.getElementsByTagName('span')[0];
        if (is$1.element(label)) {
-          label.childNodes[0].nodeValue = value;
+          label.childNodes[0].nodeValue = val;
        }
      }
    };
@@ -2269,15 +2268,12 @@ var controls = {
    // Bail if setting not true
    if (!this.config.tooltips.seek || !is$1.element(this.elements.inputs.seek) || !is$1.element(this.elements.display.seekTooltip) || this.duration === 0) {
      return;
-    } // Calculate percentage
+    }
    var percent = 0;
    var clientRect = this.elements.progress.getBoundingClientRect();
    var visible = "".concat(this.config.classNames.tooltip, "--visible");
-    var toggle = function toggle(_toggle) {
+    var toggle = function toggle(show) {
-      toggleClass(_this5.elements.display.seekTooltip, visible, _toggle);
+      return toggleClass(_this5.elements.display.seekTooltip, visible, show);
    }; // Hide on touch
@@ -2287,6 +2283,9 @@ var controls = {
    } // Determine percentage, if already visible
    var percent = 0;
    var clientRect = this.elements.progress.getBoundingClientRect();
    if (is$1.event(event)) {
      percent = 100 / clientRect.width * (event.pageX - clientRect.left);
    } else if (hasClass(this.elements.display.seekTooltip, visible)) {
@@ -2647,8 +2646,8 @@ var controls = {
    var target = pane;
    if (!is$1.element(target)) {
-      target = Object.values(this.elements.settings.panels).find(function (pane) {
+      target = Object.values(this.elements.settings.panels).find(function (p) {
-        return !pane.hidden;
+        return !p.hidden;
      });
    }
@@ -2903,17 +2902,15 @@ var controls = {
      if (control === 'settings' && !is$1.empty(_this10.config.settings)) {
-        var _control = createElement('div', extend({}, defaultAttributes, {
+        var wrapper = createElement('div', extend({}, defaultAttributes, {
          class: "".concat(defaultAttributes.class, " plyr__menu").trim(),
          hidden: ''
        }));
-
+        wrapper.appendChild(createButton.call(_this10, 'settings', {
        _control.appendChild(createButton.call(_this10, 'settings', {
          'aria-haspopup': true,
          'aria-controls': "plyr-settings-".concat(data.id),
          'aria-expanded': false
        }));
        var popup = createElement('div', {
          class: 'plyr__menu__container',
          id: "plyr-settings-".concat(data.id),
@@ -3002,12 +2999,10 @@ var controls = {
        });
        popup.appendChild(inner);
-
+        wrapper.appendChild(popup);
-        _control.appendChild(popup);
+        container.appendChild(wrapper);
        container.appendChild(_control);
        _this10.elements.settings.popup = popup;
-        _this10.elements.settings.menu = _control;
+        _this10.elements.settings.menu = wrapper;
      } // Picture in picture button
@@ -3338,6 +3333,7 @@ var captions = {
        meta.set(track, {
          default: track.mode === 'showing'
        }); // Turn off native caption rendering to avoid double captions
        // eslint-disable-next-line no-param-reassign
        track.mode = 'hidden'; // Add event listener for cue changes
@@ -3519,8 +3515,8 @@ var captions = {
    });
    var track;
    languages.every(function (language) {
-      track = sorted.find(function (track) {
+      track = sorted.find(function (t) {
-        return track.language === language;
+        return t.language === language;
      });
      return !track; // Break iteration if there is a match
    }); // If no match is found but is required, get first
@@ -3644,7 +3640,7 @@ var defaults$1 = {
  // Sprite (for icons)
  loadSprite: true,
  iconPrefix: 'plyr',
-  iconUrl: 'https://cdn.plyr.io/3.5.4/plyr.svg',
+  iconUrl: 'https://cdn.plyr.io/3.5.6/plyr.svg',
  // Blank video (used to prevent errors on source change)
  blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
  // Quality default
@@ -3699,7 +3695,8 @@ var defaults$1 = {
  controls: ['play-large', // 'restart',
  // 'rewind',
  'play', // 'fast-forward',
-  'progress', 'current-time', 'mute', 'volume', 'captions', 'settings', 'pip', 'airplay', // 'download',
+  'progress', 'current-time', // 'duration',
  'mute', 'volume', 'captions', 'settings', 'pip', 'airplay', // 'download',
  'fullscreen'],
  settings: ['captions', 'quality', 'speed'],
  // Localisation
@@ -3757,8 +3754,7 @@ var defaults$1 = {
    },
    youtube: {
      sdk: 'https://www.youtube.com/iframe_api',
-      api: 'https://noembed.com/embed?url=https://www.youtube.com/watch?v={0}' // 'https://www.googleapis.com/youtube/v3/videos?id={0}&key={1}&fields=items(snippet(title),fileDetails)&part=snippet',
+      api: 'https://noembed.com/embed?url=https://www.youtube.com/watch?v={0}'
    },
    googleIMA: {
      sdk: 'https://imasdk.googleapis.com/js/sdkloader/ima3.js'
@@ -4043,8 +4039,6 @@ function onChange() {
 }
 function toggleFallback() {
  var _this = this;
  var toggle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
  // Store or restore scroll position
@@ -4084,12 +4078,7 @@ function toggleFallback() {
      viewport.content = viewport.content.split(',').filter(function (part) {
        return part.trim() !== property;
      }).join(',');
-    } // Force a repaint as sometimes Safari doesn't want to fill the screen
+    }
    setTimeout(function () {
      return repaint(_this.target);
    }, 100);
  } // Toggle button and fire events
@@ -4100,7 +4089,7 @@ var Fullscreen =
 /*#__PURE__*/
 function () {
  function Fullscreen(player) {
-    var _this2 = this;
+    var _this = this;
    _classCallCheck(this, Fullscreen);
@@ -4120,16 +4109,16 @@ function () {
    on.call(this.player, document, this.prefix === 'ms' ? 'MSFullscreenChange' : "".concat(this.prefix, "fullscreenchange"), function () {
      // TODO: Filter for target??
-      onChange.call(_this2);
+      onChange.call(_this);
    }); // Fullscreen toggle on double click
    on.call(this.player, this.player.elements.container, 'dblclick', function (event) {
      // Ignore double click in controls
-      if (is$1.element(_this2.player.elements.controls) && _this2.player.elements.controls.contains(event.target)) {
+      if (is$1.element(_this.player.elements.controls) && _this.player.elements.controls.contains(event.target)) {
        return;
      }
-      _this2.toggle();
+      _this.toggle();
    }); // Update the UI
    this.update();
@@ -4477,7 +4466,9 @@ var ui = {
    toggleClass(this.elements.container, this.config.classNames.stopped, this.stopped); // Set state
    Array.from(this.elements.buttons.play || []).forEach(function (target) {
-      target.pressed = _this3.playing;
+      Object.assign(target, {
        pressed: _this3.playing
      });
    }); // Only update controls on non timeupdate events
    if (is$1.event(event) && event.type === 'timeupdate') {
@@ -4504,13 +4495,13 @@ var ui = {
  },
  // Toggle controls based on state and `force` argument
  toggleControls: function toggleControls(force) {
-    var controls = this.elements.controls;
+    var controlsElement = this.elements.controls;
-    if (controls && this.config.hideControls) {
+    if (controlsElement && this.config.hideControls) {
      // Don't hide controls if a touch-device user recently seeked. (Must be limited to touch devices, or it occasionally prevents desktop controls from hiding.)
      var recentTouchSeek = this.touch && this.lastSeekTime + 2000 > Date.now(); // Show controls if force, loading, paused, button interaction, or recent seek, otherwise hide
-      this.toggleControls(Boolean(force || this.loading || this.paused || controls.pressed || controls.hover || recentTouchSeek));
+      this.toggleControls(Boolean(force || this.loading || this.paused || controlsElement.pressed || controlsElement.hover || recentTouchSeek));
    }
  }
 };
@@ -4660,14 +4651,14 @@ function () {
            break;
          /* case 73:
-          this.setLoop('start');
+              this.setLoop('start');
-          break;
+              break;
-          case 76:
+           case 76:
-          this.setLoop();
+              this.setLoop();
-          break;
+              break;
-          case 79:
+           case 79:
-          this.setLoop('end');
+              this.setLoop('end');
-          break; */
+              break; */
          default:
            break;
@@ -4778,11 +4769,11 @@ function () {
      on.call(player, elements.container, 'mousemove mouseleave touchstart touchmove enterfullscreen exitfullscreen', function (event) {
-        var controls = elements.controls; // Remove button states for fullscreen
+        var controlsElement = elements.controls; // Remove button states for fullscreen
-        if (controls && event.type === 'enterfullscreen') {
+        if (controlsElement && event.type === 'enterfullscreen') {
-          controls.pressed = false;
+          controlsElement.pressed = false;
-          controls.hover = false;
+          controlsElement.hover = false;
        } // Show, then hide after a timeout unless another control event occurs
@@ -4801,15 +4792,7 @@ function () {
        timers.controls = setTimeout(function () {
          return ui.toggleControls.call(player, false);
        }, delay);
-      }); // Force edge to repaint on exit fullscreen
+      }); // Set a gutter for Vimeo
      // TODO: Fix weird bug where Edge doesn't re-draw when exiting fullscreen
      /* if (browser.isEdge) {
          on.call(player, elements.container, 'exitfullscreen', () => {
              setTimeout(() => repaint(elements.container), 100);
          });
      } */
      // Set a gutter for Vimeo
      var setGutter = function setGutter(ratio, padding, toggle) {
        if (!player.isVimeo) {
@@ -4844,16 +4827,21 @@ function () {
      };
      var resized = function resized() {
-        window.clearTimeout(timers.resized);
+        clearTimeout(timers.resized);
-        timers.resized = window.setTimeout(setPlayerSize, 50);
+        timers.resized = setTimeout(setPlayerSize, 50);
      };
      on.call(player, elements.container, 'enterfullscreen exitfullscreen', function (event) {
        var _player$fullscreen = player.fullscreen,
            target = _player$fullscreen.target,
-            usingNative = _player$fullscreen.usingNative; // Ignore for iOS native
+            usingNative = _player$fullscreen.usingNative; // Ignore events not from target
-        if (!player.isEmbed || target !== elements.container) {
+        if (target !== elements.container) {
          return;
        } // If it's not an embed and no ratio specified
        if (!player.isEmbed && is$1.empty(player.config.ratio)) {
          return;
        }
@@ -5247,7 +5235,6 @@ function () {
      this.bind(elements.controls, 'focusin', function () {
        var config = player.config,
            elements = player.elements,
            timers = player.timers; // Skip transition to prevent focus from scrolling the parent element
        toggleClass(elements.controls, config.classNames.noTransition, true); // Toggle
@@ -5989,23 +5976,22 @@ var youtube = {
    if (is$1.object(window.YT) && is$1.function(window.YT.Player)) {
      youtube.ready.call(this);
    } else {
-      // Load the API
+      // Reference current global callback
-      loadScript(this.config.urls.youtube.sdk).catch(function (error) {
+      var callback = window.onYouTubeIframeAPIReady; // Set callback to process queue
        _this.debug.warn('YouTube API failed to load', error);
      }); // Setup callback for the API
      // YouTube has it's own system of course...
      window.onYouTubeReadyCallbacks = window.onYouTubeReadyCallbacks || []; // Add to queue
      window.onYouTubeReadyCallbacks.push(function () {
        youtube.ready.call(_this);
      }); // Set callback to process queue
      window.onYouTubeIframeAPIReady = function () {
-        window.onYouTubeReadyCallbacks.forEach(function (callback) {
+        // Call global callback if set
        if (is$1.function(callback)) {
          callback();
-        });
+        }
-      };
+
        youtube.ready.call(_this);
      }; // Load the SDK
      loadScript(this.config.urls.youtube.sdk).catch(function (error) {
        _this.debug.warn('YouTube API failed to load', error);
      });
    }
  },
  // Get the media title
@@ -6035,7 +6021,7 @@ var youtube = {
  ready: function ready() {
    var player = this; // Ignore already setup (race condition)
-    var currentId = player.media.getAttribute('id');
+    var currentId = player.media && player.media.getAttribute('id');
    if (!is$1.empty(currentId) && currentId.startsWith('youtube-')) {
      return;
@@ -6060,8 +6046,8 @@ var youtube = {
    });
    player.media = replaceElement(container, player.media); // Id to poster wrapper
-    var posterSrc = function posterSrc(format) {
+    var posterSrc = function posterSrc(s) {
-      return "https://i.ytimg.com/vi/".concat(videoId, "/").concat(format, "default.jpg");
+      return "https://i.ytimg.com/vi/".concat(videoId, "/").concat(s, "default.jpg");
    }; // Check thumbnail images in order of quality, but reject fallback thumbnails (120px wide)
@@ -6074,9 +6060,9 @@ var youtube = {
    }) // 360p padded 4:3. Always exists
    .then(function (image) {
      return ui.setPoster.call(player, image.src);
-    }).then(function (posterSrc) {
+    }).then(function (src) {
      // If the image is padded, use background-size "cover" instead (like youtube does too with their posters)
-      if (!posterSrc.includes('maxres')) {
+      if (!src.includes('maxres')) {
        player.elements.poster.style.backgroundSize = 'cover';
      }
    }).catch(function () {});
@@ -6617,8 +6603,8 @@ function () {
      }); // Advertisement regular events
      Object.keys(google.ima.AdEvent.Type).forEach(function (type) {
-        _this6.manager.addEventListener(google.ima.AdEvent.Type[type], function (event) {
+        _this6.manager.addEventListener(google.ima.AdEvent.Type[type], function (e) {
-          return _this6.onAdEvent(event);
+          return _this6.onAdEvent(e);
        });
      }); // Resolve our adsManager
@@ -6666,8 +6652,7 @@ function () {
      var adData = event.getAdData(); // Proxy event
      var dispatchEvent = function dispatchEvent(type) {
-        var event = "ads".concat(type.replace(/_/g, '').toLowerCase());
+        triggerEvent.call(_this8.player, _this8.player.media, "ads".concat(type.replace(/_/g, '').toLowerCase()));
        triggerEvent.call(_this8.player, _this8.player.media, event);
      }; // Bubble the event
@@ -7123,7 +7108,11 @@ function () {
      }
      this.getThumbnails().then(function () {
-        // Render DOM elements
+        if (!_this.enabled) {
          return;
        } // Render DOM elements
        _this.render(); // Check to see if thumb container size was specified manually in CSS
@@ -7458,6 +7447,7 @@ function () {
        if (image.dataset.index !== currentImage.dataset.index && !image.dataset.deleting) {
          // Wait 200ms, as the new image can take some time to show on certain browsers (even though it was downloaded before showing). This will prevent flicker, and show some generosity towards slower clients
          // First set attribute 'deleting' to prevent multi-handling of this on repeat firing of this function
          // eslint-disable-next-line no-param-reassign
          image.dataset.deleting = true; // This has to be set before the timeout - to prevent issues switching between hover and scrub
          var currentImageContainer = _this8.currentImageContainer;
@@ -7636,10 +7626,14 @@ function () {
      } // Find difference between height and preview container height
-      var multiplier = this.thumbContainerHeight / frame.h;
+      var multiplier = this.thumbContainerHeight / frame.h; // eslint-disable-next-line no-param-reassign
-      previewImage.style.height = "".concat(Math.floor(previewImage.naturalHeight * multiplier), "px");
+
-      previewImage.style.width = "".concat(Math.floor(previewImage.naturalWidth * multiplier), "px");
+      previewImage.style.height = "".concat(Math.floor(previewImage.naturalHeight * multiplier), "px"); // eslint-disable-next-line no-param-reassign
-      previewImage.style.left = "-".concat(frame.x * multiplier, "px");
+
      previewImage.style.width = "".concat(Math.floor(previewImage.naturalWidth * multiplier), "px"); // eslint-disable-next-line no-param-reassign
      previewImage.style.left = "-".concat(frame.x * multiplier, "px"); // eslint-disable-next-line no-param-reassign
      previewImage.style.top = "-".concat(frame.y * multiplier, "px");
    }
  }, {
@@ -8471,32 +8465,32 @@ function () {
  }, {
    key: "isHTML5",
    get: function get() {
-      return Boolean(this.provider === providers.html5);
+      return this.provider === providers.html5;
    }
  }, {
    key: "isEmbed",
    get: function get() {
-      return Boolean(this.isYouTube || this.isVimeo);
+      return this.isYouTube || this.isVimeo;
    }
  }, {
    key: "isYouTube",
    get: function get() {
-      return Boolean(this.provider === providers.youtube);
+      return this.provider === providers.youtube;
    }
  }, {
    key: "isVimeo",
    get: function get() {
-      return Boolean(this.provider === providers.vimeo);
+      return this.provider === providers.vimeo;
    }
  }, {
    key: "isVideo",
    get: function get() {
-      return Boolean(this.type === types.video);
+      return this.type === types.video;
    }
  }, {
    key: "isAudio",
    get: function get() {
-      return Boolean(this.type === types.audio);
+      return this.type === types.audio;
    }
  }, {
    key: "playing",
@@ -6,24 +6,28 @@
 const path = require('path');
 const gulp = require('gulp');
-
+// ------------------------------------
 // JavaScript
 // ------------------------------------
 const terser = require('gulp-terser');
 const rollup = require('gulp-better-rollup');
 const babel = require('rollup-plugin-babel');
 const commonjs = require('rollup-plugin-commonjs');
 const resolve = require('rollup-plugin-node-resolve');
-
+// ------------------------------------
 // CSS
 // ------------------------------------
 const sass = require('gulp-sass');
 const clean = require('gulp-clean-css');
 const prefix = require('gulp-autoprefixer');
-
+// ------------------------------------
 // Images
 // ------------------------------------
 const svgstore = require('gulp-svgstore');
 const imagemin = require('gulp-imagemin');
-
+// ------------------------------------
 // Utils
 // ------------------------------------
 const del = require('del');
 const filter = require('gulp-filter');
 const header = require('gulp-header');
@@ -37,18 +41,22 @@ const plumber = require('gulp-plumber');
 const size = require('gulp-size');
 const sourcemaps = require('gulp-sourcemaps');
 const through = require('through2');
-
+// ------------------------------------
 // Deployment
 // ------------------------------------
 const aws = require('aws-sdk');
 const publish = require('gulp-awspublish');
 const FastlyPurge = require('fastly-purge');
-
+// ------------------------------------
 // Configs
 // ------------------------------------
 const pkg = require('./package.json');
 const build = require('./build.json');
 const deploy = require('./deploy.json');
-
+// ------------------------------------
 // Info from package
 // ------------------------------------
 const { browserslist: browsers, version } = pkg;
 const minSuffix = '.min';
 // Get AWS config
@@ -125,15 +133,16 @@ gulp.task(tasks.clean, done => {
 // JavaScript
 Object.entries(build.js).forEach(([filename, entry]) => {
-    entry.formats.forEach(format => {
+    const { dist, formats, namespace, polyfill, src } = entry;
    formats.forEach(format => {
        const name = `js:${filename}:${format}`;
        tasks.js.push(name);
        const polyfill = filename.includes('polyfilled');
        const extension = format === 'es' ? 'mjs' : 'js';
        tasks.js.push(name);
        gulp.task(name, () =>
            gulp
-                .src(entry.src)
+                .src(src)
                .pipe(plumber())
                .pipe(sourcemaps.init())
                .pipe(
@@ -159,7 +168,7 @@ Object.entries(build.js).forEach(([filename, entry]) => {
                            ],
                        },
                        {
-                            name: entry.namespace,
+                            name: namespace,
                            format,
                        },
                    ),
@@ -170,25 +179,26 @@ Object.entries(build.js).forEach(([filename, entry]) => {
                        extname: `.${extension}`,
                    }),
                )
-                .pipe(gulp.dest(entry.dist))
+                .pipe(gulp.dest(dist))
                .pipe(filter(`**/*.${extension}`))
                .pipe(terser())
                .pipe(rename({ suffix: minSuffix }))
                .pipe(size(sizeOptions))
                .pipe(sourcemaps.write(''))
-                .pipe(gulp.dest(entry.dist)),
+                .pipe(gulp.dest(dist)),
        );
    });
 });
 // CSS
 Object.entries(build.css).forEach(([filename, entry]) => {
    const { dist, src } = entry;
    const name = `css:${filename}`;
    tasks.css.push(name);
    gulp.task(name, () =>
        gulp
-            .src(entry.src)
+            .src(src)
            .pipe(plumber())
            .pipe(sass())
            .pipe(
@@ -198,24 +208,25 @@ Object.entries(build.css).forEach(([filename, entry]) => {
            )
            .pipe(clean())
            .pipe(size(sizeOptions))
-            .pipe(gulp.dest(entry.dist)),
+            .pipe(gulp.dest(dist)),
    );
 });
 // SVG Sprites
 Object.entries(build.sprite).forEach(([filename, entry]) => {
    const { dist, src } = entry;
    const name = `sprite:${filename}`;
    tasks.sprite.push(name);
    gulp.task(name, () =>
        gulp
-            .src(entry.src)
+            .src(src)
            .pipe(plumber())
            .pipe(imagemin())
            .pipe(svgstore())
            .pipe(rename({ basename: path.parse(filename).name }))
            .pipe(size(sizeOptions))
-            .pipe(gulp.dest(entry.dist)),
+            .pipe(gulp.dest(dist)),
    );
 });
@@ -1,6 +1,6 @@
 {
    "name": "plyr",
-    "version": "3.5.4",
+    "version": "3.5.6",
    "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
    "homepage": "https://plyr.io",
    "author": "Sam Potts <sam@potts.es>",
@@ -31,31 +31,33 @@
    "scripts": {
        "build": "gulp build",
        "lint": "eslint src/js && npm run-script remark",
        "lint:fix": "eslint --fix src/js",
        "remark": "remark -f --use 'validate-links=repository:\"sampotts/plyr\"' '{,!(node_modules),.?**/}*.md'",
        "deploy": "yarn lint && gulp deploy"
    },
    "devDependencies": {
-        "ansi-colors": "^3.2.4",
+        "ansi-colors": "^4.0.1",
-        "aws-sdk": "^2.437.0",
+        "aws-sdk": "^2.478.0",
-        "@babel/core": "^7.4.3",
+        "@babel/core": "^7.4.5",
-        "@babel/preset-env": "^7.4.3",
+        "@babel/preset-env": "^7.4.5",
-        "babel-eslint": "^10.0.1",
+        "babel-eslint": "^10.0.2",
-        "del": "^4.1.0",
+        "del": "^4.1.1",
        "eslint": "^5.16.0",
        "eslint-config-airbnb-base": "^13.1.0",
-        "eslint-config-prettier": "^4.1.0",
+        "eslint-config-prettier": "^5.0.0",
-        "eslint-plugin-import": "^2.16.0",
+        "eslint-plugin-import": "^2.17.3",
        "eslint-plugin-simple-import-sort": "^4.0.0",
        "fancy-log": "^1.3.3",
        "fastly-purge": "^1.0.1",
        "git-branch": "^2.0.1",
-        "gulp": "^4.0.0",
+        "gulp": "^4.0.2",
-        "gulp-autoprefixer": "^6.0.0",
+        "gulp-autoprefixer": "^6.1.0",
        "gulp-awspublish": "^4.0.0",
        "gulp-better-rollup": "^4.0.1",
-        "gulp-clean-css": "^4.0.0",
+        "gulp-clean-css": "^4.2.0",
-        "gulp-filter": "^5.1.0",
+        "gulp-filter": "^6.0.0",
        "gulp-header": "^2.0.7",
-        "gulp-imagemin": "^5.0.3",
+        "gulp-imagemin": "^6.0.0",
        "gulp-open": "^3.0.1",
        "gulp-plumber": "^1.2.1",
        "gulp-postcss": "^8.0.0",
@@ -65,31 +67,30 @@
        "gulp-size": "^3.0.0",
        "gulp-sourcemaps": "^2.6.5",
        "gulp-svgstore": "^7.0.1",
-        "gulp-terser": "^1.1.7",
+        "gulp-terser": "^1.2.0",
-        "postcss-custom-properties": "^8.0.10",
+        "postcss-custom-properties": "^9.0.1",
-        "prettier-eslint": "^8.8.2",
+        "prettier-eslint": "^9.0.0",
        "prettier-stylelint": "^0.4.2",
        "remark-cli": "^6.0.1",
-        "remark-validate-links": "^8.0.2",
+        "remark-validate-links": "^8.0.3",
-        "rollup": "^1.10.0",
+        "rollup": "^1.15.6",
        "rollup-plugin-babel": "^4.3.2",
-        "rollup-plugin-commonjs": "^9.3.4",
+        "rollup-plugin-commonjs": "^10.0.0",
-        "rollup-plugin-node-resolve": "^4.2.3",
+        "rollup-plugin-node-resolve": "^5.0.3",
-        "stylelint": "^9.10.1",
+        "stylelint": "^10.1.0",
-        "stylelint-config-prettier": "^5.0.0",
+        "stylelint-config-prettier": "^5.2.0",
-        "stylelint-config-recommended": "^2.1.0",
+        "stylelint-config-recommended": "^2.2.0",
-        "stylelint-config-sass-guidelines": "^5.4.0",
+        "stylelint-config-sass-guidelines": "^6.0.0",
-        "stylelint-order": "^2.2.1",
+        "stylelint-order": "^3.0.0",
-        "stylelint-scss": "^3.5.4",
+        "stylelint-scss": "^3.8.0",
        "stylelint-selector-bem-pattern": "^2.1.0",
        "through2": "^3.0.1"
    },
    "dependencies": {
-        "core-js": "^3.0.1",
+        "core-js": "^3.1.4",
        "custom-event-polyfill": "^1.0.7",
        "loadjs": "^3.6.1",
        "rangetouch": "^2.0.0",
        "raven-js": "^3.27.0",
        "url-polyfill": "^1.1.5"
    }
 }
@@ -23,9 +23,6 @@
        "editor.tabSize": 4,
        "editor.insertSpaces": true,
        "editor.formatOnSave": true,
        "editor.codeActionsOnSave": {
            "source.organizeImports": true
        },
        // Trim on save
        "files.trimTrailingWhitespace": true
@@ -6,13 +6,12 @@ Plyr is a simple, lightweight, accessible and customizable HTML5, YouTube and Vi
 # Features
 -   📼 **HTML Video & Audio, YouTube & Vimeo** - support for the major formats
 -   💪 **Accessible** - full support for VTT captions and screen readers
 -   🔧 **[Customisable](#html)** - make the player look how you want with the markup you want
-   😎 **Good HTML** - uses the _right_ elements. `<input type="range">` for volume and `<progress>` for progress and well, `<button>`s for buttons. There's no
+-   😎 **Clean HTML** - uses the _right_ elements. `<input type="range">` for volume and `<progress>` for progress and well, `<button>`s for buttons. There's no
    `<span>` or `<a href="#">` button hacks
 -   📱 **Responsive** - works with any screen size
 -   📼 **HTML Video & Audio** - support for both formats
 -   📺 **[Embedded Video](#embeds)** - support for YouTube and Vimeo video playback
 -   💵 **[Monetization](#ads)** - make money from your videos
 -   📹 **[Streaming](#demos)** - support for hls.js, Shaka and dash.js streaming playback
 -   🎛 **[API](#api)** - toggle playback, volume, seeking, and more through a standardized API
@@ -25,7 +24,7 @@ Plyr is a simple, lightweight, accessible and customizable HTML5, YouTube and Vi
 -   📖 **Multiple captions** - support for multiple caption tracks
 -   🌎 **i18n support** - support for internationalization of controls
 -   👌 **[Preview thumbnails](#preview-thumbnails)** - support for displaying preview thumbnails
-   🤟 **No dependencies** - written in "vanilla" ES6 JavaScript, no jQuery required
+-   🤟 **No frameworks** - written in "vanilla" ES6 JavaScript, no jQuery required
 -   💁‍♀️ **SASS** - to include in your build processes
 ### Demos
@@ -109,7 +108,15 @@ Or the `<div>` non progressively enhanced method:
 ## JavaScript
-Include the `plyr.js` script before the closing `</body>` tag and then in your JS create a new instance of Plyr as below.
+You can use Plyr as an ES6 module as follows:
 ```javascript
 import Plyr from 'plyr';
 const player = new Plyr('#player');
 ```
 Alertnatively you can include the `plyr.js` script before the closing `</body>` tag and then in your JS create a new instance of Plyr as below.
 ```html
 <script src="path/to/plyr.js"></script>
@@ -123,18 +130,18 @@ See [initialising](#initialising) for more information on advanced setups.
 You can use our CDN (provided by [Fastly](https://www.fastly.com/)) for the JavaScript. There's 2 versions; one with and one without [polyfills](#polyfills). My recommendation would be to manage polyfills seperately as part of your application but to make life easier you can use the polyfilled build.
 ```html
-<script src="https://cdn.plyr.io/3.5.4/plyr.js"></script>
+<script src="https://cdn.plyr.io/3.5.6/plyr.js"></script>
 ```
 ...or...
 ```html
-<script src="https://cdn.plyr.io/3.5.4/plyr.polyfilled.js"></script>
+<script src="https://cdn.plyr.io/3.5.6/plyr.polyfilled.js"></script>
 ```
 ## CSS
-Include the `plyr.css` stylsheet into your `<head>`
+Include the `plyr.css` stylsheet into your `<head>`.
 ```html
 <link rel="stylesheet" href="path/to/plyr.css" />
@@ -143,13 +150,13 @@ Include the `plyr.css` stylsheet into your `<head>`
 If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the default CSS, you can use the following:
 ```html
-<link rel="stylesheet" href="https://cdn.plyr.io/3.5.4/plyr.css" />
+<link rel="stylesheet" href="https://cdn.plyr.io/3.5.6/plyr.css" />
 ```
 ## SVG Sprite
 The SVG sprite is loaded automatically from our CDN (provided by [Fastly](https://www.fastly.com/)). To change this, see the [options](#options) below. For
-reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.5.4/plyr.svg`.
+reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.5.6/plyr.svg`.
 # Ads
@@ -204,7 +211,7 @@ WebVTT captions are supported. To add a caption track, check the HTML example ab
 You can specify a range of arguments for the constructor to use:
-   A CSS string selector that's compatible with [`querySelector`](https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelector)
+-   A [CSS string selector](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors)
 -   A [`HTMLElement`](https://developer.mozilla.org/en/docs/Web/API/HTMLElement)
 -   A [jQuery](https://jquery.com) object
@@ -212,7 +219,7 @@ _Note_: If a `NodeList`, `Array`, or jQuery object are passed, the first element
 #### Single player
-Passing a [string selector](https://developer.mozilla.org/en-US/docs/Web/API/NodeList):
+Passing a CSS string selector that's compatible with [`querySelector`](https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelector):
 ```javascript
 const player = new Plyr('#player');
@@ -238,7 +245,7 @@ You have two choices here. You can either use a simple array loop to map the con
 const players = Array.from(document.querySelectorAll('.js-player')).map(p => new Plyr(p));
 ```
-...or use a static method where you can pass a [string selector](https://developer.mozilla.org/en-US/docs/Web/API/NodeList), a [NodeList](https://developer.mozilla.org/en-US/docs/Web/API/NodeList), an [Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) of elements, or a [JQuery](https://jquery.com) object:
+...or use a static method where you can pass a [CSS string selector](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors), a [NodeList](https://developer.mozilla.org/en-US/docs/Web/API/NodeList), an [Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) of [HTMLElement](https://developer.mozilla.org/en/docs/Web/API/HTMLElement), or a [JQuery](https://jquery.com) object:
 ```javascript
 const players = Plyr.setup('.js-player');
@@ -655,7 +662,7 @@ The arguments are:
 -   Provider (`html5`, `youtube` or `vimeo`)
 -   Whether the player has the `playsinline` attribute (only applicable to iOS 10+)
-## Disable support programatically
+## Disable support programmatically
 The `enabled` option can be used to disable certain User Agents. For example, if you don't want to use Plyr for smartphones, you could use:
@@ -703,6 +710,7 @@ Plyr costs money to run, not only my time. I donate my time for free as I enjoy
 -   [HTML5 Weekly #177](http://html5weekly.com/issues/177)
 -   [Responsive Design #149](http://us4.campaign-archive2.com/?u=559bc631fe5294fc66f5f7f89&id=451a61490f)
 -   [Web Design Weekly #174](https://web-design-weekly.com/2015/02/24/web-design-weekly-174/)
 -   [Front End Focus #177](https://frontendfoc.us/issues/177)
 -   [Hacker News](https://news.ycombinator.com/item?id=9136774)
 -   [Web Platform Daily](http://webplatformdaily.org/releases/2015-03-04)
 -   [LayerVault Designer News](https://news.layervault.com/stories/45394-plyr--a-simple-html5-media-player)
@@ -722,7 +730,7 @@ Plyr costs money to run, not only my time. I donate my time for free as I enjoy
 -   [Sparkk TV](https://www.sparkktv.com/)
 -   [@halfhalftravel](https://www.halfhalftravel.com/)
-Let me know on [Twitter](https://twitter.com/sam_potts) I can add you to the above list. It'd be awesome to see how you're using Plyr :-)
+If you want to be added to the list, open a pull request. It'd be awesome to see how you're using Plyr 😎
 # Useful links and credits
@@ -85,7 +85,6 @@ const captions = {
        const browserLanguages = navigator.languages || [navigator.language || navigator.userLanguage || 'en'];
        const languages = dedupe(browserLanguages.map(language => language.split('-')[0]));
        let language = (this.storage.get('language') || this.config.captions.language || 'auto').toLowerCase();
        // Use first browser language when language is 'auto'
@@ -134,6 +133,7 @@ const captions = {
                    });
                    // Turn off native caption rendering to avoid double captions
                    // eslint-disable-next-line no-param-reassign
                    track.mode = 'hidden';
                    // Add event listener for cue changes
@@ -166,7 +166,6 @@ const captions = {
        const { toggled } = this.captions; // Current state
        const activeClass = this.config.classNames.captions.active;
        // Get the next state
        // If the method is called without parameter, toggle based on current value
        const active = is.nullOrUndefined(input) ? !toggled : input;
@@ -304,7 +303,7 @@ const captions = {
        let track;
        languages.every(language => {
-            track = sorted.find(track => track.language === language);
+            track = sorted.find(t => t.language === language);
            return !track; // Break iteration if there is a match
        });
@@ -61,7 +61,7 @@ const defaults = {
    // Sprite (for icons)
    loadSprite: true,
    iconPrefix: 'plyr',
-    iconUrl: 'https://cdn.plyr.io/3.5.4/plyr.svg',
+    iconUrl: 'https://cdn.plyr.io/3.5.6/plyr.svg',
    // Blank video (used to prevent errors on source change)
    blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@@ -128,6 +128,7 @@ const defaults = {
        // 'fast-forward',
        'progress',
        'current-time',
        // 'duration',
        'mute',
        'volume',
        'captions',
@@ -195,7 +196,7 @@ const defaults = {
        },
        youtube: {
            sdk: 'https://www.youtube.com/iframe_api',
-            api: 'https://noembed.com/embed?url=https://www.youtube.com/watch?v={0}', // 'https://www.googleapis.com/youtube/v3/videos?id={0}&key={1}&fields=items(snippet(title),fileDetails)&part=snippet',
+            api: 'https://noembed.com/embed?url=https://www.youtube.com/watch?v={0}',
        },
        googleIMA: {
            sdk: 'https://imasdk.googleapis.com/js/sdkloader/ima3.js',
@@ -4,17 +4,31 @@
 // ==========================================================================
 import RangeTouch from 'rangetouch';
 import captions from './captions';
 import html5 from './html5';
 import support from './support';
 import { repaint, transitionEndEvent } from './utils/animation';
 import { dedupe } from './utils/arrays';
 import browser from './utils/browser';
-import { createElement, emptyElement, getAttributesFromSelector, getElement, getElements, hasClass, matches, removeElement, setAttributes, setFocus, toggleClass, toggleHidden } from './utils/elements';
+import {
    createElement,
    emptyElement,
    getAttributesFromSelector,
    getElement,
    getElements,
    hasClass,
    matches,
    removeElement,
    setAttributes,
    setFocus,
    toggleClass,
    toggleHidden,
 } from './utils/elements';
 import { off, on } from './utils/events';
 import i18n from './utils/i18n';
 import is from './utils/is';
-import loadSprite from './utils/loadSprite';
+import loadSprite from './utils/load-sprite';
 import { extend } from './utils/objects';
 import { getPercentage, replaceAll, toCamelCase, toTitleCase } from './utils/strings';
 import { formatTime, getHours } from './utils/time';
@@ -92,7 +106,6 @@ const controls = {
        const namespace = 'http://www.w3.org/2000/svg';
        const iconUrl = controls.getIconUrl.call(this);
        const iconPath = `${!iconUrl.cors ? iconUrl.url : ''}#${this.config.iconPrefix}`;
        // Create <svg>
        const icon = document.createElementNS(namespace, 'svg');
        setAttributes(
@@ -480,15 +493,15 @@ const controls = {
            get() {
                return menuItem.getAttribute('aria-checked') === 'true';
            },
-            set(checked) {
+            set(check) {
                // Ensure exclusivity
-                if (checked) {
+                if (check) {
                    Array.from(menuItem.parentNode.children)
                        .filter(node => matches(node, '[role="menuitemradio"]'))
                        .forEach(node => node.setAttribute('aria-checked', 'false'));
                }
-                menuItem.setAttribute('aria-checked', checked ? 'true' : 'false');
+                menuItem.setAttribute('aria-checked', check ? 'true' : 'false');
            },
        });
@@ -596,17 +609,17 @@ const controls = {
        let value = 0;
        const setProgress = (target, input) => {
-            const value = is.number(input) ? input : 0;
+            const val = is.number(input) ? input : 0;
            const progress = is.element(target) ? target : this.elements.display.buffer;
            // Update value and label
            if (is.element(progress)) {
-                progress.value = value;
+                progress.value = val;
                // Update text label inside
                const label = progress.getElementsByTagName('span')[0];
                if (is.element(label)) {
-                    label.childNodes[0].nodeValue = value;
+                    label.childNodes[0].nodeValue = val;
                }
            }
        };
@@ -688,14 +701,8 @@ const controls = {
            return;
        }
        // Calculate percentage
        let percent = 0;
        const clientRect = this.elements.progress.getBoundingClientRect();
        const visible = `${this.config.classNames.tooltip}--visible`;
-
+        const toggle = show => toggleClass(this.elements.display.seekTooltip, visible, show);
        const toggle = toggle => {
            toggleClass(this.elements.display.seekTooltip, visible, toggle);
        };
        // Hide on touch
        if (this.touch) {
@@ -704,6 +711,9 @@ const controls = {
        }
        // Determine percentage, if already visible
        let percent = 0;
        const clientRect = this.elements.progress.getBoundingClientRect();
        if (is.event(event)) {
            percent = (100 / clientRect.width) * (event.pageX - clientRect.left);
        } else if (hasClass(this.elements.display.seekTooltip, visible)) {
@@ -1100,7 +1110,7 @@ const controls = {
        let target = pane;
        if (!is.element(target)) {
-            target = Object.values(this.elements.settings.panels).find(pane => !pane.hidden);
+            target = Object.values(this.elements.settings.panels).find(p => !p.hidden);
        }
        const firstItem = target.querySelector('[role^="menuitem"]');
@@ -1398,7 +1408,7 @@ const controls = {
            // Settings button / menu
            if (control === 'settings' && !is.empty(this.config.settings)) {
-                const control = createElement(
+                const wrapper = createElement(
                    'div',
                    extend({}, defaultAttributes, {
                        class: `${defaultAttributes.class} plyr__menu`.trim(),
@@ -1406,7 +1416,7 @@ const controls = {
                    }),
                );
-                control.appendChild(
+                wrapper.appendChild(
                    createButton.call(this, 'settings', {
                        'aria-haspopup': true,
                        'aria-controls': `plyr-settings-${data.id}`,
@@ -1546,11 +1556,11 @@ const controls = {
                });
                popup.appendChild(inner);
-                control.appendChild(popup);
+                wrapper.appendChild(popup);
-                container.appendChild(control);
+                container.appendChild(wrapper);
                this.elements.settings.popup = popup;
-                this.elements.settings.menu = control;
+                this.elements.settings.menu = wrapper;
            }
            // Picture in picture button
@@ -4,7 +4,6 @@
 // https://webkit.org/blog/7929/designing-websites-for-iphone-x/
 // ==========================================================================
 import { repaint } from './utils/animation';
 import browser from './utils/browser';
 import { hasClass, toggleClass, trapFocus } from './utils/elements';
 import { on, triggerEvent } from './utils/events';
@@ -73,9 +72,6 @@ function toggleFallback(toggle = false) {
                .filter(part => part.trim() !== property)
                .join(',');
        }
        // Force a repaint as sometimes Safari doesn't want to fill the screen
        setTimeout(() => repaint(this.target), 100);
    }
    // Toggle button and fire events
@@ -44,15 +44,17 @@ const html5 = {
        const player = this;
-        // Set aspect ratio if set
+        // Set aspect ratio if fixed
-        setAspectRatio.call(player);
+        if (!is.empty(this.config.ratio)) {
            setAspectRatio.call(player);
        }
        // Quality
        Object.defineProperty(player.media, 'quality', {
            get() {
                // Get sources
                const sources = html5.getSources.call(player);
-                const source = sources.find(source => source.getAttribute('src') === player.source);
+                const source = sources.find(s => s.getAttribute('src') === player.source);
                // Return size, if match is found
                return source && Number(source.getAttribute('size'));
@@ -60,9 +62,8 @@ const html5 = {
            set(input) {
                // Get sources
                const sources = html5.getSources.call(player);
                // Get first match for requested size
-                const source = sources.find(source => Number(source.getAttribute('size')) === input);
+                const source = sources.find(s => Number(s.getAttribute('size')) === input);
                // No matching source found
                if (!source) {
@@ -147,7 +147,7 @@ class Listeners {
                    player.loop = !player.loop;
                    break;
-                    /* case 73:
+                /* case 73:
                    this.setLoop('start');
                    break;
@@ -275,17 +275,16 @@ class Listeners {
            elements.container,
            'mousemove mouseleave touchstart touchmove enterfullscreen exitfullscreen',
            event => {
-                const { controls } = elements;
+                const { controls: controlsElement } = elements;
                // Remove button states for fullscreen
-                if (controls && event.type === 'enterfullscreen') {
+                if (controlsElement && event.type === 'enterfullscreen') {
-                    controls.pressed = false;
+                    controlsElement.pressed = false;
-                    controls.hover = false;
+                    controlsElement.hover = false;
                }
                // Show, then hide after a timeout unless another control event occurs
                const show = ['touchstart', 'touchmove', 'mousemove'].includes(event.type);
                let delay = 0;
                if (show) {
@@ -302,14 +301,6 @@ class Listeners {
            },
        );
        // Force edge to repaint on exit fullscreen
        // TODO: Fix weird bug where Edge doesn't re-draw when exiting fullscreen
        /* if (browser.isEdge) {
            on.call(player, elements.container, 'exitfullscreen', () => {
                setTimeout(() => repaint(elements.container), 100);
            });
        } */
        // Set a gutter for Vimeo
        const setGutter = (ratio, padding, toggle) => {
            if (!player.isVimeo) {
@@ -338,20 +329,24 @@ class Listeners {
        };
        const resized = () => {
-            window.clearTimeout(timers.resized);
+            clearTimeout(timers.resized);
-            timers.resized = window.setTimeout(setPlayerSize, 50);
+            timers.resized = setTimeout(setPlayerSize, 50);
        };
        on.call(player, elements.container, 'enterfullscreen exitfullscreen', event => {
            const { target, usingNative } = player.fullscreen;
-            // Ignore for iOS native
+            // Ignore events not from target
-            if (!player.isEmbed || target !== elements.container) {
+            if (target !== elements.container) {
                return;
            }
            // If it's not an embed and no ratio specified
            if (!player.isEmbed && is.empty(player.config.ratio)) {
                return;
            }
            const isEnter = event.type === 'enterfullscreen';
            // Set the player size when entering fullscreen to viewport size
            const { padding, ratio } = setPlayerSize(isEnter);
@@ -542,7 +537,6 @@ class Listeners {
    controls() {
        const { player } = this;
        const { elements } = player;
        // IE doesn't support input event, so we fallback to change
        const inputEvent = browser.isIE ? 'change' : 'input';
@@ -678,7 +672,6 @@ class Listeners {
            // Was playing before?
            const play = seek.hasAttribute(attribute);
            // Done seeking
            const done = ['mouseup', 'touchend', 'keyup'].includes(event.type);
@@ -706,7 +699,6 @@ class Listeners {
            inputEvent,
            event => {
                const seek = event.currentTarget;
                // If it exists, use seek-value instead of "value" for consistency with tooltip time (#954)
                let seekTo = seek.getAttribute('seek-value');
@@ -806,7 +798,7 @@ class Listeners {
        // Show controls when they receive focus (e.g., when using keyboard tab key)
        this.bind(elements.controls, 'focusin', () => {
-            const { config, elements, timers } = player;
+            const { config, timers } = player;
            // Skip transition to prevent focus from scrolling the parent element
            toggleClass(elements.controls, config.classNames.noTransition, true);
@@ -837,10 +829,8 @@ class Listeners {
                // Detect "natural" scroll - suppored on OS X Safari only
                // Other browsers on OS X will be inverted until support improves
                const inverted = event.webkitDirectionInvertedFromDevice;
                // Get delta from event. Invert if `inverted` is true
                const [x, y] = [event.deltaX, -event.deltaY].map(value => (inverted ? -value : value));
                // Using the biggest delta, normalize to 1 or -1 (or 0 if no delta)
                const direction = Math.sign(Math.abs(x) > Math.abs(y) ? x : y);
@@ -10,7 +10,7 @@ import { createElement } from '../utils/elements';
 import { triggerEvent } from '../utils/events';
 import i18n from '../utils/i18n';
 import is from '../utils/is';
-import loadScript from '../utils/loadScript';
+import loadScript from '../utils/load-script';
 import { formatTime } from '../utils/time';
 import { buildUrlParams } from '../utils/urls';
@@ -267,7 +267,7 @@ class Ads {
        // Advertisement regular events
        Object.keys(google.ima.AdEvent.Type).forEach(type => {
-            this.manager.addEventListener(google.ima.AdEvent.Type[type], event => this.onAdEvent(event));
+            this.manager.addEventListener(google.ima.AdEvent.Type[type], e => this.onAdEvent(e));
        });
        // Resolve our adsManager
@@ -303,7 +303,6 @@ class Ads {
     */
    onAdEvent(event) {
        const { container } = this.player.elements;
        // Retrieve the ad from the event. Some events (e.g. ALL_ADS_COMPLETED)
        // don't have ad object associated
        const ad = event.getAd();
@@ -311,8 +310,7 @@ class Ads {
        // Proxy event
        const dispatchEvent = type => {
-            const event = `ads${type.replace(/_/g, '').toLowerCase()}`;
+            triggerEvent.call(this.player, this.player.media, `ads${type.replace(/_/g, '').toLowerCase()}`);
            triggerEvent.call(this.player, this.player.media, event);
        };
        // Bubble the event
@@ -100,6 +100,10 @@ class PreviewThumbnails {
        }
        this.getThumbnails().then(() => {
            if (!this.enabled) {
                return;
            }
            // Render DOM elements
            this.render();
@@ -121,7 +125,6 @@ class PreviewThumbnails {
            // If string, convert into single-element list
            const urls = is.string(src) ? [src] : src;
            // Loop through each src URL. Download and process the VTT file, storing the resulting data in this.thumbnails
            const promises = urls.map(u => this.getThumbnail(u));
@@ -426,7 +429,9 @@ class PreviewThumbnails {
            if (image.dataset.index !== currentImage.dataset.index && !image.dataset.deleting) {
                // Wait 200ms, as the new image can take some time to show on certain browsers (even though it was downloaded before showing). This will prevent flicker, and show some generosity towards slower clients
                // First set attribute 'deleting' to prevent multi-handling of this on repeat firing of this function
                // eslint-disable-next-line no-param-reassign
                image.dataset.deleting = true;
                // This has to be set before the timeout - to prevent issues switching between hover and scrub
                const { currentImageContainer } = this;
@@ -467,7 +472,6 @@ class PreviewThumbnails {
                                const { urlPrefix } = this.thumbnails[0];
                                const thumbURL = urlPrefix + newThumbFilename;
                                const previewImage = new Image();
                                previewImage.src = thumbURL;
                                previewImage.onload = () => {
@@ -601,11 +605,9 @@ class PreviewThumbnails {
        const seekbarRect = this.player.elements.progress.getBoundingClientRect();
        const plyrRect = this.player.elements.container.getBoundingClientRect();
        const { container } = this.elements.thumb;
        // Find the lowest and highest desired left-position, so we don't slide out the side of the video container
        const minVal = plyrRect.left - seekbarRect.left + 10;
        const maxVal = plyrRect.right - seekbarRect.left - container.clientWidth - 10;
        // Set preview container position to: mousepos, minus seekbar.left, minus half of previewContainer.clientWidth
        let previewPos = this.mousePosX - seekbarRect.left - container.clientWidth / 2;
@@ -636,9 +638,13 @@ class PreviewThumbnails {
        // Find difference between height and preview container height
        const multiplier = this.thumbContainerHeight / frame.h;
        // eslint-disable-next-line no-param-reassign
        previewImage.style.height = `${Math.floor(previewImage.naturalHeight * multiplier)}px`;
        // eslint-disable-next-line no-param-reassign
        previewImage.style.width = `${Math.floor(previewImage.naturalWidth * multiplier)}px`;
        // eslint-disable-next-line no-param-reassign
        previewImage.style.left = `-${frame.x * multiplier}px`;
        // eslint-disable-next-line no-param-reassign
        previewImage.style.top = `-${frame.y * multiplier}px`;
    }
 }
@@ -9,7 +9,7 @@ import { createElement, replaceElement, toggleClass } from '../utils/elements';
 import { triggerEvent } from '../utils/events';
 import fetch from '../utils/fetch';
 import is from '../utils/is';
-import loadScript from '../utils/loadScript';
+import loadScript from '../utils/load-script';
 import { extend } from '../utils/objects';
 import { format, stripHTML } from '../utils/strings';
 import { setAspectRatio } from '../utils/style';
@@ -91,7 +91,6 @@ const vimeo = {
        }
        const id = parseId(source);
        // Build an iframe
        const iframe = createElement('iframe');
        const src = format(player.config.urls.vimeo.iframe, id, params);
@@ -102,7 +101,6 @@ const vimeo = {
        // Get poster, if already set
        const { poster } = player;
        // Inject the package
        const wrapper = createElement('div', { poster, class: player.config.classNames.embedContainer });
        wrapper.appendChild(iframe);
@@ -7,8 +7,8 @@ import { createElement, replaceElement, toggleClass } from '../utils/elements';
 import { triggerEvent } from '../utils/events';
 import fetch from '../utils/fetch';
 import is from '../utils/is';
-import loadImage from '../utils/loadImage';
+import loadImage from '../utils/load-image';
-import loadScript from '../utils/loadScript';
+import loadScript from '../utils/load-script';
 import { extend } from '../utils/objects';
 import { format, generateId } from '../utils/strings';
 import { setAspectRatio } from '../utils/style';
@@ -56,26 +56,23 @@ const youtube = {
        if (is.object(window.YT) && is.function(window.YT.Player)) {
            youtube.ready.call(this);
        } else {
-            // Load the API
+            // Reference current global callback
-            loadScript(this.config.urls.youtube.sdk).catch(error => {
+            const callback = window.onYouTubeIframeAPIReady;
                this.debug.warn('YouTube API failed to load', error);
            });
            // Setup callback for the API
            // YouTube has it's own system of course...
            window.onYouTubeReadyCallbacks = window.onYouTubeReadyCallbacks || [];
            // Add to queue
            window.onYouTubeReadyCallbacks.push(() => {
                youtube.ready.call(this);
            });
            // Set callback to process queue
            window.onYouTubeIframeAPIReady = () => {
-                window.onYouTubeReadyCallbacks.forEach(callback => {
+                // Call global callback if set
                if (is.function(callback)) {
                    callback();
-                });
+                }
                youtube.ready.call(this);
            };
            // Load the SDK
            loadScript(this.config.urls.youtube.sdk).catch(error => {
                this.debug.warn('YouTube API failed to load', error);
            });
        }
    },
@@ -107,9 +104,8 @@ const youtube = {
    // API ready
    ready() {
        const player = this;
        // Ignore already setup (race condition)
-        const currentId = player.media.getAttribute('id');
+        const currentId = player.media && player.media.getAttribute('id');
        if (!is.empty(currentId) && currentId.startsWith('youtube-')) {
            return;
        }
@@ -125,25 +121,23 @@ const youtube = {
        // Replace the <iframe> with a <div> due to YouTube API issues
        const videoId = parseId(source);
        const id = generateId(player.provider);
        // Get poster, if already set
        const { poster } = player;
        // Replace media element
        const container = createElement('div', { id, poster });
        player.media = replaceElement(container, player.media);
        // Id to poster wrapper
-        const posterSrc = format => `https://i.ytimg.com/vi/${videoId}/${format}default.jpg`;
+        const posterSrc = s => `https://i.ytimg.com/vi/${videoId}/${s}default.jpg`;
        // Check thumbnail images in order of quality, but reject fallback thumbnails (120px wide)
        loadImage(posterSrc('maxres'), 121) // Higest quality and unpadded
            .catch(() => loadImage(posterSrc('sd'), 121)) // 480p padded 4:3
            .catch(() => loadImage(posterSrc('hq'))) // 360p padded 4:3. Always exists
            .then(image => ui.setPoster.call(player, image.src))
-            .then(posterSrc => {
+            .then(src => {
                // If the image is padded, use background-size "cover" instead (like youtube does too with their posters)
-                if (!posterSrc.includes('maxres')) {
+                if (!src.includes('maxres')) {
                    player.elements.poster.style.backgroundSize = 'cover';
                }
            })
@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v3.5.4
+// plyr.js v3.5.6
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -15,7 +15,7 @@ import Fullscreen from './fullscreen';
 import Listeners from './listeners';
 import media from './media';
 import Ads from './plugins/ads';
-import PreviewThumbnails from './plugins/previewThumbnails';
+import PreviewThumbnails from './plugins/preview-thumbnails';
 import source from './source';
 import Storage from './storage';
 import support from './support';
@@ -24,7 +24,7 @@ import { closest } from './utils/arrays';
 import { createElement, hasClass, removeElement, replaceElement, toggleClass, wrap } from './utils/elements';
 import { off, on, once, triggerEvent, unbindListeners } from './utils/events';
 import is from './utils/is';
-import loadSprite from './utils/loadSprite';
+import loadSprite from './utils/load-sprite';
 import { clamp } from './utils/numbers';
 import { cloneDeep, extend } from './utils/objects';
 import { getAspectRatio, reduceAspectRatio, setAspectRatio, validateRatio } from './utils/style';
@@ -151,7 +151,6 @@ class Plyr {
        // Set media type based on tag or data attribute
        // Supported: video, audio, vimeo, youtube
        const type = this.media.tagName.toLowerCase();
        // Embed properties
        let iframe = null;
        let url = null;
@@ -324,27 +323,27 @@ class Plyr {
     * Types and provider helpers
     */
    get isHTML5() {
-        return Boolean(this.provider === providers.html5);
+        return this.provider === providers.html5;
    }
    get isEmbed() {
-        return Boolean(this.isYouTube || this.isVimeo);
+        return this.isYouTube || this.isVimeo;
    }
    get isYouTube() {
-        return Boolean(this.provider === providers.youtube);
+        return this.provider === providers.youtube;
    }
    get isVimeo() {
-        return Boolean(this.provider === providers.vimeo);
+        return this.provider === providers.vimeo;
    }
    get isVideo() {
-        return Boolean(this.type === types.video);
+        return this.type === types.video;
    }
    get isAudio() {
-        return Boolean(this.type === types.audio);
+        return this.type === types.audio;
    }
    /**
@@ -514,7 +513,6 @@ class Plyr {
    get duration() {
        // Faux duration set via config
        const fauxDuration = parseFloat(this.config.duration);
        // Media duration can be NaN or Infinity before the media has loaded
        const realDuration = (this.media || {}).duration;
        const duration = !is.number(realDuration) || realDuration === Infinity ? 0 : realDuration;
@@ -1045,10 +1043,8 @@ class Plyr {
        if (this.supported.ui && !this.isAudio) {
            // Get state before change
            const isHidden = hasClass(this.elements.container, this.config.classNames.hideControls);
            // Negate the argument if not undefined since adding the class to hides the controls
            const force = typeof toggle === 'undefined' ? undefined : !toggle;
            // Apply and get updated state
            const hiding = toggleClass(this.elements.container, this.config.classNames.hideControls, force);
@@ -1,12 +1,13 @@
 // ==========================================================================
 // Plyr Polyfilled Build
-// plyr.js v3.5.4
+// plyr.js v3.5.6
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
 import 'custom-event-polyfill';
 import 'url-polyfill';
 import Plyr from './plyr';
 export default Plyr;
@@ -10,7 +10,7 @@ import { getElement, toggleClass } from './utils/elements';
 import { ready, triggerEvent } from './utils/events';
 import i18n from './utils/i18n';
 import is from './utils/is';
-import loadImage from './utils/loadImage';
+import loadImage from './utils/load-image';
 const ui = {
    addStyleHook() {
@@ -213,7 +213,7 @@ const ui = {
        // Set state
        Array.from(this.elements.buttons.play || []).forEach(target => {
-            target.pressed = this.playing;
+            Object.assign(target, { pressed: this.playing });
        });
        // Only update controls on non timeupdate events
@@ -247,15 +247,22 @@ const ui = {
    // Toggle controls based on state and `force` argument
    toggleControls(force) {
-        const { controls } = this.elements;
+        const { controls: controlsElement } = this.elements;
-        if (controls && this.config.hideControls) {
+        if (controlsElement && this.config.hideControls) {
            // Don't hide controls if a touch-device user recently seeked. (Must be limited to touch devices, or it occasionally prevents desktop controls from hiding.)
            const recentTouchSeek = this.touch && this.lastSeekTime + 2000 > Date.now();
            // Show controls if force, loading, paused, button interaction, or recent seek, otherwise hide
            this.toggleControls(
-                Boolean(force || this.loading || this.paused || controls.pressed || controls.hover || recentTouchSeek),
+                Boolean(
                    force ||
                        this.loading ||
                        this.paused ||
                        controlsElement.pressed ||
                        controlsElement.hover ||
                        recentTouchSeek,
                ),
            );
        }
    },
@@ -2,7 +2,6 @@
 // Animation utils
 // ==========================================================================
 import { toggleHidden } from './elements';
 import is from './is';
 export const transitionEndEvent = (() => {
@@ -21,14 +20,19 @@ export const transitionEndEvent = (() => {
 })();
 // Force repaint of element
-export function repaint(element) {
+export function repaint(element, delay) {
    setTimeout(() => {
        try {
-            toggleHidden(element, true);
+            // eslint-disable-next-line no-param-reassign
-            element.offsetHeight; // eslint-disable-line
+            element.hidden = true;
-            toggleHidden(element, false);
+
            // eslint-disable-next-line no-unused-expressions
            element.offsetHeight;
            // eslint-disable-next-line no-param-reassign
            element.hidden = false;
        } catch (e) {
            // Do nothing
        }
-    }, 0);
+    }, delay);
 }
@@ -17,7 +17,6 @@ export function wrap(elements, wrapper) {
        .reverse()
        .forEach((element, index) => {
            const child = index > 0 ? wrapper.cloneNode(true) : wrapper;
            // Cache the current parent and sibling.
            const parent = element.parentNode;
            const sibling = element.nextSibling;
@@ -145,12 +144,10 @@ export function getAttributesFromSelector(sel, existingAttributes) {
        const selector = s.trim();
        const className = selector.replace('.', '');
        const stripped = selector.replace(/[[\]]/g, '');
        // Get the parts and value
        const parts = stripped.split('=');
        const [key] = parts;
        const value = parts.length > 1 ? parts[1].replace(/["']/g, '') : '';
        // Get the first character
        const start = selector.charAt(0);
@@ -195,11 +192,8 @@ export function toggleHidden(element, hidden) {
        hide = !element.hidden;
    }
-    if (hide) {
+    // eslint-disable-next-line no-param-reassign
-        element.setAttribute('hidden', '');
+    element.hidden = hide;
    } else {
        element.removeAttribute('hidden');
    }
 }
 // Mirror Element.classList.toggle, with IE compatibility for "force" argument
@@ -234,14 +228,14 @@ export function matches(element, selector) {
        return Array.from(document.querySelectorAll(selector)).includes(this);
    }
-    const matches =
+    const method =
        prototype.matches ||
        prototype.webkitMatchesSelector ||
        prototype.mozMatchesSelector ||
        prototype.msMatchesSelector ||
        match;
-    return matches.call(element, selector);
+    return method.call(element, selector);
 }
 // Find all elements
@@ -35,7 +35,6 @@ export function toggleListener(element, event, callback, toggle = false, passive
    // Allow multiple events
    const events = event.split(' ');
    // Build options
    // Default to just the capture boolean for browsers with no passive listener support
    let options = capture;
@@ -36,8 +36,8 @@ const i18n = {
            '{title}': config.title,
        };
-        Object.entries(replace).forEach(([key, value]) => {
+        Object.entries(replace).forEach(([k, v]) => {
-            string = replaceAll(string, key, value);
+            string = replaceAll(string, k, v);
        });
        return string;
@@ -15,10 +15,10 @@ export default function loadSprite(url, id) {
    const prefix = 'cache';
    const hasId = is.string(id);
    let isCached = false;
    const exists = () => document.getElementById(id) !== null;
    const update = (container, data) => {
        // eslint-disable-next-line no-param-reassign
        container.innerHTML = data;
        // Check again incase of race condition
@@ -33,7 +33,6 @@ export default function loadSprite(url, id) {
    // Only load once if ID set
    if (!hasId || !exists()) {
        const useStorage = Storage.supported;
        // Create container
        const container = document.createElement('div');
        container.setAttribute('hidden', '');
@@ -27,15 +27,8 @@ export function reduceAspectRatio(ratio) {
 }
 export function getAspectRatio(input) {
-    const parse = ratio => {
+    const parse = ratio => (validateRatio(ratio) ? ratio.split(':').map(Number) : null);
-        if (!validateRatio(ratio)) {
+    // Try provided ratio
            return null;
        }
        return ratio.split(':').map(Number);
    };
    // Provided ratio
    let ratio = parse(input);
    // Get from config
@@ -64,7 +57,6 @@ export function setAspectRatio(input) {
    }
    const ratio = getAspectRatio.call(this, input);
    const [w, h] = is.array(ratio) ? ratio : [0, 0];
    const padding = (100 / w) * h;
@@ -18,7 +18,6 @@ export function formatTime(time = 0, displayHours = false, inverted = false) {
    // Format time component to add leading zero
    const format = value => `0${value}`.slice(-2);
    // Breakdown to hours, mins, secs
    let hours = getHours(time);
    const mins = getMinutes(time);
@@ -63,10 +63,6 @@ a.plyr__control {
 // Video control
 .plyr--video .plyr__control {
    svg {
        filter: drop-shadow(0 1px 1px rgba(#000, 0.15));
    }
    // Hover and tab focus
    &.plyr__tab-focus,
    &:hover,
@@ -81,7 +77,6 @@ a.plyr__control {
    background: rgba($plyr-video-control-bg-hover, 0.8);
    border: 0;
    border-radius: 100%;
    box-shadow: 0 1px 1px rgba(#000, 0.15);
    color: $plyr-video-control-color;
    display: none;
    left: 50%;
@@ -16,6 +16,7 @@
    .plyr__progress__container {
        flex: 1;
        min-width: 0; // Fix for Edge issue where content would overflow
    }
    // Spacing
@@ -62,12 +62,13 @@
    .plyr__video-wrapper {
        height: 100%;
-        width: 100%;
+        position: static;
    }
    // Vimeo requires some different styling
    &.plyr--vimeo .plyr__video-wrapper {
        height: 0;
        position: relative;
        top: 50%;
        transform: translateY(-50%);
    }
@@ -23,7 +23,7 @@
    // The countdown label
    &::after {
-        background: rgba($plyr-color-gunmetal, 0.8);
+        background: rgba($plyr-color-gray-9, 0.8);
        border-radius: 2px;
        bottom: $plyr-control-spacing;
        color: #fff;
@@ -7,7 +7,7 @@ $plyr-preview-bg: $plyr-tooltip-bg !default;
 $plyr-preview-radius: $plyr-tooltip-radius !default;
 $plyr-preview-shadow: $plyr-tooltip-shadow !default;
 $plyr-preview-arrow-size: $plyr-tooltip-arrow-size !default;
-$plyr-preview-image-bg: $plyr-color-heather !default;
+$plyr-preview-image-bg: $plyr-color-gray-2 !default;
 $plyr-preview-time-font-size: $plyr-font-size-time !default;
 $plyr-preview-time-padding: 3px 6px !default;
 $plyr-preview-time-bg: rgba(0, 0, 0, 0.55);
@@ -41,7 +41,7 @@
@import 'states/fullscreen';
@import 'plugins/ads';
-@import 'plugins/previewThumbnails';
+@import 'plugins/preview-thumbnails';
@import 'utils/animation';
@import 'utils/hidden';
@@ -2,5 +2,5 @@
 // Badges
 // ==========================================================================
-$plyr-badge-bg: $plyr-color-fiord !default;
+$plyr-badge-bg: $plyr-color-gray-7 !default;
 $plyr-badge-color: #fff !default;
@@ -2,8 +2,16 @@
 // Colors
 // ==========================================================================
-$plyr-color-main: #1aafff !default;
+$plyr-color-main: hsl(198, 100%, 50%) !default;
-$plyr-color-gunmetal: #2f343d !default;
+
-$plyr-color-fiord: #4f5b5f !default;
+// Grayscale
-$plyr-color-lynch: #6b7d85 !default;
+$plyr-color-gray-9: hsl(210, 15%, 16%);
-$plyr-color-heather: #b7c5cd !default;
+$plyr-color-gray-8: lighten($plyr-color-gray-9, 9%);
 $plyr-color-gray-7: lighten($plyr-color-gray-8, 9%);
 $plyr-color-gray-6: lighten($plyr-color-gray-7, 9%);
 $plyr-color-gray-5: lighten($plyr-color-gray-6, 9%);
 $plyr-color-gray-4: lighten($plyr-color-gray-5, 9%);
 $plyr-color-gray-3: lighten($plyr-color-gray-4, 9%);
 $plyr-color-gray-2: lighten($plyr-color-gray-3, 9%);
 $plyr-color-gray-1: lighten($plyr-color-gray-2, 9%);
 $plyr-color-gray-0: lighten($plyr-color-gray-1, 9%);
@@ -13,6 +13,6 @@ $plyr-video-control-color-hover: #fff !default;
 $plyr-video-control-bg-hover: $plyr-color-main !default;
 $plyr-audio-controls-bg: #fff !default;
-$plyr-audio-control-color: $plyr-color-fiord !default;
+$plyr-audio-control-color: $plyr-color-gray-7 !default;
 $plyr-audio-control-color-hover: #fff !default;
 $plyr-audio-control-bg-hover: $plyr-color-main !default;
@@ -3,8 +3,8 @@
 // ==========================================================================
 $plyr-menu-bg: rgba(#fff, 0.9) !default;
-$plyr-menu-color: $plyr-color-fiord !default;
+$plyr-menu-color: $plyr-color-gray-7 !default;
 $plyr-menu-arrow-size: 6px !default;
-$plyr-menu-border-color: $plyr-color-heather !default;
+$plyr-menu-border-color: $plyr-color-gray-2 !default;
 $plyr-menu-border-shadow-color: #fff !default;
 $plyr-menu-shadow: 0 1px 2px rgba(#000, 0.15) !default;
@@ -4,8 +4,8 @@
 // Loading
 $plyr-progress-loading-size: 25px !default;
-$plyr-progress-loading-bg: rgba($plyr-color-gunmetal, 0.6) !default;
+$plyr-progress-loading-bg: rgba($plyr-color-gray-9, 0.6) !default;
 // Buffered
 $plyr-video-progress-buffered-bg: rgba(#fff, 0.25) !default;
-$plyr-audio-progress-buffered-bg: rgba($plyr-color-heather, 0.66) !default;
+$plyr-audio-progress-buffered-bg: rgba($plyr-color-gray-2, 0.66) !default;
@@ -9,7 +9,7 @@ $plyr-range-thumb-active-shadow-width: 3px !default;
 $plyr-range-thumb-height: 13px !default;
 $plyr-range-thumb-bg: #fff !default;
 $plyr-range-thumb-border: 2px solid transparent !default;
-$plyr-range-thumb-shadow: 0 1px 1px rgba(#000, 0.15), 0 0 0 1px rgba($plyr-color-gunmetal, 0.2) !default;
+$plyr-range-thumb-shadow: 0 1px 1px rgba(#000, 0.15), 0 0 0 1px rgba($plyr-color-gray-9, 0.2) !default;
 // Track
 $plyr-range-track-height: 5px !default;
@@ -3,7 +3,7 @@
 // ==========================================================================
 $plyr-tooltip-bg: rgba(#fff, 0.9) !default;
-$plyr-tooltip-color: $plyr-color-fiord !default;
+$plyr-tooltip-color: $plyr-color-gray-7 !default;
 $plyr-tooltip-padding: ($plyr-control-spacing / 2) !default;
 $plyr-tooltip-arrow-size: 4px !default;
 $plyr-tooltip-radius: 3px !default;
Author	SHA1	Message	Date
Sam Potts	7c442c9357	3.5.6	2019-06-21 12:35:47 +10:00
Sam Potts	e17e0a81dd	Package upgrade	2019-06-21 12:35:22 +10:00
Sam Potts	2488299d7b	Edge fix	2019-06-21 12:34:49 +10:00
Sam Potts	dfc09b8e04	v3.5.5 deployed	2019-06-21 00:24:28 +10:00
Sam Potts	6438baaddc	Merge branch 'develop'	2019-06-21 00:19:51 +10:00
Sam Potts	8fc6c2ba52	File rename and clean up	2019-06-21 00:19:37 +10:00
Sam Potts	95092edc93	Merge pull request #1472 from sampotts/develop v3.5.5	2019-06-21 00:12:10 +10:00
Sam Potts	c4b3e0672e	Clean up	2019-06-21 00:10:57 +10:00
Sam Potts	e8e2b8ba39	Merge branch 'master' into develop # Conflicts: # .eslintrc # demo/dist/demo.css # demo/dist/demo.js # demo/dist/demo.min.js # demo/dist/demo.min.js.map # dist/plyr.css # dist/plyr.js # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.min.mjs # dist/plyr.min.mjs.map # dist/plyr.mjs # dist/plyr.polyfilled.js # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map # dist/plyr.polyfilled.min.mjs # dist/plyr.polyfilled.min.mjs.map # dist/plyr.polyfilled.mjs # package.json # readme.md # src/js/listeners.js # yarn.lock	2019-06-20 23:56:19 +10:00
Sam Potts	2e40b91ec1	Styling tweaks for demo	2019-06-20 23:50:46 +10:00
Sam Potts	97d9228bed	Aspect ratio tweaks	2019-06-03 20:13:16 +10:00
Sam Potts	0f14865d56	Add duration (commented out) in defaults	2019-06-03 20:12:43 +10:00
Sam Potts	c94ab2a39f	Repaint clean up	2019-06-03 20:12:21 +10:00
Sam Potts	ab89e055de	Demo tweaks	2019-06-03 20:11:31 +10:00
Sam Potts	ac6e3dba5a	Fix for thumbnails in demo for audio	2019-06-03 00:28:09 +10:00
Sam Potts	d9d2c4a219	Demo tweaks	2019-06-03 00:26:08 +10:00
Sam Potts	1890a9378d	Gulp tweaks	2019-06-02 23:16:45 +10:00
Sam Potts	ac88e6e190	Demo clean up	2019-06-02 23:16:29 +10:00
Sam Potts	15cbae8a19	Removed commented out code for Edge	2019-06-02 22:25:44 +10:00
Sam Potts	aaf096d96d	Removed raven-js from dependencies	2019-06-02 22:25:17 +10:00
Sam Potts	93f5acbffd	Fixed cite display	2019-06-02 22:25:00 +10:00
Sam Potts	9c717275d2	Packages for demo separated	2019-06-02 22:24:41 +10:00
Sam Potts	0249772f01	Clean up	2019-06-01 19:50:29 +10:00
Sam Potts	5d699d5f47	Merge branch 'develop' of github.com:sampotts/plyr into develop	2019-06-01 19:29:21 +10:00
Sam Potts	34d79a5443	Merge pull request #1453 from aFarkas/develop youtube multiple small issues	2019-06-01 18:46:56 +10:00
Sam Potts	1e761e237a	Merge pull request #1458 from Jason-Cooke/patch-1 docs: fix typo	2019-06-01 18:46:14 +10:00
Sam Potts	36ad132c82	Edge fix	2019-06-01 18:45:12 +10:00
Sam Potts	c9055f391b	Linting changes	2019-06-01 18:45:07 +10:00
Jason Cooke	99c95363b4	docs: fix typo	2019-06-01 11:13:44 +12:00
Sam Potts	c90526bf07	Create FUNDING.yml	2019-05-27 17:17:05 +10:00
Alexander Farkas	97a6e72e10	fix youtube embed + handle early destroy	2019-05-24 16:55:45 +02:00
Alexander Farkas	f100caba81	fix youtube embed + handle early destroy	2019-05-24 16:53:58 +02:00
Sam Potts	80aa6ffe43	Linting changes	2019-04-30 23:44:05 +10:00