v3.5.9 deployed

v3.5.9

.eslintrc

@@ -0,0 +1,30 @@
+{
+    "parser": "babel-eslint",
+    "extends": ["airbnb-base", "prettier"],
+    "plugins": ["simple-import-sort", "import"],
+    "env": {
+        "browser": true,
+        "es6": true
+    },
+    "globals": {
+        "Plyr": false,
+        "jQuery": false
+    },
+    "rules": {
+        "import/no-cycle": "warn",
+        "padding-line-between-statements": [
+            "error",
+            {
+                "blankLine": "never",
+                "prev": ["singleline-const", "singleline-let", "singleline-var"],
+                "next": ["singleline-const", "singleline-let", "singleline-var"]
+            }
+        ],
+        "sort-imports": "off",
+        "import/order": "off",
+        "simple-import-sort/sort": "error"
+    },
+    "parserOptions": {
+        "sourceType": "module"
+    }
+}

.eslintrc.json

@@ -1,35 +0,0 @@
-{
-    "parser": "babel-eslint",
-    "extends": ["airbnb-base", "prettier"],
-    "env": {
-        "browser": true,
-        "es6": true
-    },
-    "globals": {
-        "Plyr": false,
-        "jQuery": false
-    },
-    "rules": {
-        "import/no-cycle": 1,
-        "no-const-assign": 1,
-        "no-shadow": 0,
-        "no-this-before-super": 1,
-        "no-undef": 1,
-        "no-unreachable": 1,
-        "no-unused-vars": 1,
-        "constructor-super": 1,
-        "valid-typeof": 1,
-        "indent": [2, 4, { "SwitchCase": 1 }],
-        "quotes": [2, "single", "avoid-escape"],
-        "semi": [2, "always"],
-        "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"
-    }
-}

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+github: sampotts
+patreon: plyr
+open_collective: plyr

.gitignore

@@ -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/

.npmignore

@@ -2,8 +2,9 @@ demo
 .github
 .vscode
 *.code-workspace
+build.json
 credentials.json
-bundles.json
+deploy.json
 yarn.lock
 package-lock.json
 *.mp4

.nvmrc

@@ -0,0 +1 @@
+v13.8.0

.vscode/extensions.json

@@ -2,11 +2,11 @@
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
     "recommendations": [
-        // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
         "dbaeumer.vscode-eslint",
-        "wix.vscode-import-cost",
         "esbenp.prettier-vscode",
-        "shinnn.stylelint",
-        "wayou.vscode-todo-highlight"
+        "wayou.vscode-todo-highlight",
+        "wix.vscode-import-cost",
+        "stylelint.vscode-stylelint",
+        "pflannery.vscode-versionlens"
     ]
 }

build.json

@@ -0,0 +1,48 @@
+{
+    "js": {
+        "plyr.js": {
+            "src": "./src/js/plyr.js",
+            "dist": "./dist/",
+            "formats": ["es", "umd"],
+            "namespace": "Plyr"
+        },
+        "plyr.polyfilled.js": {
+            "src": "./src/js/plyr.polyfilled.js",
+            "dist": "./dist/",
+            "formats": ["es", "umd"],
+            "namespace": "Plyr",
+            "polyfill": true
+        },
+        "demo.js": {
+            "src": "./demo/src/js/demo.js",
+            "dist": "./demo/dist/",
+            "formats": ["iife"],
+            "namespace": "Demo",
+            "polyfill": true
+        }
+    },
+    "css": {
+        "plyr.css": {
+            "src": "./src/sass/plyr.scss",
+            "dist": "./dist/"
+        },
+        "demo.css": {
+            "src": "./demo/src/sass/bundles/demo.scss",
+            "dist": "./demo/dist/"
+        },
+        "error.css": {
+            "src": "./demo/src/sass/bundles/error.scss",
+            "dist": "./demo/dist/"
+        }
+    },
+    "sprite": {
+        "plyr.svg": {
+            "src": "./src/sprite/*.svg",
+            "dist": "./dist"
+        },
+        "demo.svg": {
+            "src": "./src/sprite/*.svg",
+            "dist": "./demo/dist"
+        }
+    }
+}

bundles.json

@@ -1,20 +0,0 @@
-{
-    "plyr": {
-        "sass": {
-            "plyr.css": "src/sass/plyr.scss"
-        },
-        "js": {
-            "plyr.js": "src/js/plyr.js",
-            "plyr.polyfilled.js": "src/js/plyr.polyfilled.js"
-        }
-    },
-    "demo": {
-        "sass": {
-            "demo.css": "demo/src/sass/bundles/demo.scss",
-            "error.css": "demo/src/sass/bundles/error.scss"
-        },
-        "js": {
-            "demo.js": "demo/src/js/demo.js"
-        }
-    }
-}

controls.md

@@ -28,6 +28,7 @@ controls: [
     'settings', // Settings menu
     'pip', // Picture-in-picture (currently Safari only)
     'airplay', // Airplay (currently Safari only)
+    'download', // Show a download button with a link to either the current source or a custom URL you specify in your options
     'fullscreen', // Toggle fullscreen
 ];
 ```

demo/index.html

@@ -1,191 +1,278 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <title>Plyr - A simple, customizable HTML5 Video, Audio, YouTube and Vimeo player</title>
+        <meta
+            name="description"
+            property="og:description"
+            content="A simple HTML5 media player with custom controls and WebVTT captions."
+        />
+        <meta name="author" content="Sam Potts" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-<head>
-    <meta charset="utf-8" />
-    <title>Plyr - A simple, customizable HTML5 Video, Audio, YouTube and Vimeo player</title>
-    <meta name="description" property="og:description" content="A simple HTML5 media player with custom controls and WebVTT captions.">
-    <meta name="author" content="Sam Potts">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+        <!-- Icons -->
+        <link rel="icon" href="https://cdn.plyr.io/static/icons/favicon.ico" />
+        <link rel="icon" type="image/png" href="https://cdn.plyr.io/static/icons/32x32.png" sizes="32x32" />
+        <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" />
 
-    <!-- Icons -->
-    <link rel="icon" href="https://cdn.plyr.io/static/icons/favicon.ico">
-    <link rel="icon" type="image/png" href="https://cdn.plyr.io/static/icons/32x32.png" sizes="32x32">
-    <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">
+        <!-- Open Graph -->
+        <meta
+            property="og:title"
+            content="Plyr - A simple, customizable HTML5 Video, Audio, YouTube and Vimeo player"
+        />
+        <meta property="og:site_name" content="Plyr" />
+        <meta property="og:url" content="https://plyr.io" />
+        <meta property="og:image" content="https://cdn.plyr.io/static/icons/1200x630.png" />
 
-    <!-- Opengraph -->
-    <meta property="og:title" content="Plyr - A simple, customizable HTML5 Video, Audio, YouTube and Vimeo player">
-    <meta property="og:site_name" content="Plyr">
-    <meta property="og:url" content="https://plyr.io">
-    <meta property="og:image" content="https://cdn.plyr.io/static/icons/1200x630.png">
+        <!-- Twitter -->
+        <meta name="twitter:card" content="summary" />
+        <meta name="twitter:site" content="@sam_potts" />
+        <meta name="twitter:creator" content="@sam_potts" />
+        <meta name="twitter:card" content="summary_large_image" />
 
-    <!-- Twitter -->
-    <meta name="twitter:card" content="summary">
-    <meta name="twitter:site" content="@sam_potts">
-    <meta name="twitter:creator" content="@sam_potts">
-    <meta name="twitter:card" content="summary_large_image">
+        <!-- Docs styles -->
+        <link rel="stylesheet" href="dist/demo.css" />
 
-    <!-- Docs styles -->
-    <link rel="stylesheet" href="dist/demo.css?v=2">
+        <!-- Preload -->
+        <link
+            rel="preload"
+            as="font"
+            crossorigin
+            type="font/woff2"
+            href="https://cdn.plyr.io/static/fonts/gordita-medium.woff2"
+        />
+        <link
+            rel="preload"
+            as="font"
+            crossorigin
+            type="font/woff2"
+            href="https://cdn.plyr.io/static/fonts/gordita-bold.woff2"
+        />
 
-    <!-- Preload -->
-    <link rel="preload" as="font" crossorigin type="font/woff2" href="https://cdn.plyr.io/static/fonts/gordita-medium.woff2">
-    <link rel="preload" as="font" crossorigin type="font/woff2" href="https://cdn.plyr.io/static/fonts/gordita-bold.woff2">
-</head>
+        <!-- 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>
-            <p>A simple, accessible and customisable media player for
-                <button type="button" class="faux-link" data-source="video">
-                    <svg class="icon">
-                        <title>HTML5</title>
-                        <path d="M14.738.326C14.548.118 14.28 0 14 0H2c-.28 0-.55.118-.738.326S.98.81 1.004 1.09l1 11c.03.317.208.603.48.767l5 3c.16.095.338.143.516.143s.356-.048.515-.143l5-3c.273-.164.452-.45.48-.767l1-11c.026-.28-.067-.557-.257-.764zM12 4H6v2h6v5.72l-4 1.334-4-1.333V9h2v1.28l2 .666 2-.667V8H4V2h8v2z"></path>
-                    </svg>Video</button>,
-                <button type="button" class="faux-link" data-source="audio">
-                    <svg class="icon">
-                        <title>HTML5</title>
-                        <path d="M14.738.326C14.548.118 14.28 0 14 0H2c-.28 0-.55.118-.738.326S.98.81 1.004 1.09l1 11c.03.317.208.603.48.767l5 3c.16.095.338.143.516.143s.356-.048.515-.143l5-3c.273-.164.452-.45.48-.767l1-11c.026-.28-.067-.557-.257-.764zM12 4H6v2h6v5.72l-4 1.334-4-1.333V9h2v1.28l2 .666 2-.667V8H4V2h8v2z"></path>
-                    </svg>Audio</button>,
-                <button type="button" class="faux-link" data-source="youtube">
-                    <svg class="icon" role="presentation">
-                        <title>YouTube</title>
-                        <path d="M15.8,4.8c-0.2-1.3-0.8-2.2-2.2-2.4C11.4,2,8,2,8,2S4.6,2,2.4,2.4C1,2.6,0.3,3.5,0.2,4.8C0,6.1,0,8,0,8
+    <body>
+        <div class="grid">
+            <header>
+                <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">
+                        <svg class="icon">
+                            <title>HTML5</title>
+                            <path
+                                d="M14.738.326C14.548.118 14.28 0 14 0H2c-.28 0-.55.118-.738.326S.98.81 1.004 1.09l1 11c.03.317.208.603.48.767l5 3c.16.095.338.143.516.143s.356-.048.515-.143l5-3c.273-.164.452-.45.48-.767l1-11c.026-.28-.067-.557-.257-.764zM12 4H6v2h6v5.72l-4 1.334-4-1.333V9h2v1.28l2 .666 2-.667V8H4V2h8v2z"
+                            ></path></svg
+                        >Video</button
+                    >,
+                    <button type="button" class="faux-link" data-source="audio">
+                        <svg class="icon">
+                            <title>HTML5</title>
+                            <path
+                                d="M14.738.326C14.548.118 14.28 0 14 0H2c-.28 0-.55.118-.738.326S.98.81 1.004 1.09l1 11c.03.317.208.603.48.767l5 3c.16.095.338.143.516.143s.356-.048.515-.143l5-3c.273-.164.452-.45.48-.767l1-11c.026-.28-.067-.557-.257-.764zM12 4H6v2h6v5.72l-4 1.334-4-1.333V9h2v1.28l2 .666 2-.667V8H4V2h8v2z"
+                            ></path></svg
+                        >Audio</button
+                    >,
+                    <button type="button" class="faux-link" data-source="youtube">
+                        <svg class="icon" role="presentation">
+                            <title>YouTube</title>
+                            <path
+                                d="M15.8,4.8c-0.2-1.3-0.8-2.2-2.2-2.4C11.4,2,8,2,8,2S4.6,2,2.4,2.4C1,2.6,0.3,3.5,0.2,4.8C0,6.1,0,8,0,8
                    s0,1.9,0.2,3.2c0.2,1.3,0.8,2.2,2.2,2.4C4.6,14,8,14,8,14s3.4,0,5.6-0.4c1.4-0.3,2-1.1,2.2-2.4C16,9.9,16,8,16,8S16,6.1,15.8,4.8z
-                    M6,11V5l5,3L6,11z"></path>
-                    </svg>YouTube</button> and
-                <button type="button" class="faux-link" data-source="vimeo">
-                    <svg class="icon" role="presentation">
-                        <title>Vimeo</title>
-                        <path d="M16,4.3c-0.1,1.6-1.2,3.7-3.3,6.4c-2.2,2.8-4,4.2-5.5,4.2c-0.9,0-1.7-0.9-2.4-2.6C4,9.9,3.4,5,2,5
+                    M6,11V5l5,3L6,11z"
+                            ></path></svg
+                        >YouTube
+                    </button>
+                    and
+                    <button type="button" class="faux-link" data-source="vimeo">
+                        <svg class="icon" role="presentation">
+                            <title>Vimeo</title>
+                            <path
+                                d="M16,4.3c-0.1,1.6-1.2,3.7-3.3,6.4c-2.2,2.8-4,4.2-5.5,4.2c-0.9,0-1.7-0.9-2.4-2.6C4,9.9,3.4,5,2,5
                        C1.9,5,1.5,5.3,0.8,5.8L0,4.8c0.8-0.7,3.5-3.4,4.7-3.5C5.9,1.2,6.7,2,7,3.8c0.3,2,0.8,6.1,1.8,6.1c0.9,0,2.5-3.4,2.6-4
-                       c0.1-0.9-0.3-1.9-2.3-1.1c0.8-2.6,2.3-3.8,4.5-3.8C15.3,1.1,16.1,2.2,16,4.3z"></path>
-                    </svg>Vimeo</button>
-            </p>
+                       c0.1-0.9-0.3-1.9-2.3-1.1c0.8-2.6,2.3-3.8,4.5-3.8C15.3,1.1,16.1,2.2,16,4.3z"
+                            ></path></svg
+                        >Vimeo
+                    </button>
+                </p>
 
-            <p>Premium video monitization from
-                <a href="https://vi.ai/publisher-video-monetization/?aid=plyrio" target="_blank" class="no-border">
-                    <img src="https://cdn.plyr.io/static/vi-logo-24x24.svg" alt="ai.vi">
-                    <span class="sr-only">ai.vi</span>
-                </a>
-            </p>
+                <p>
+                    Premium video monetization from
+                    <a href="https://vi.ai/publisher-video-monetization/?aid=plyrio" target="_blank" class="no-border">
+                        <img src="https://cdn.plyr.io/static/vi-logo-24x24.svg" alt="ai.vi" />
+                        <span class="sr-only">ai.vi</span>
+                    </a>
+                </p>
 
-            <div class="call-to-action">
-                <span class="button--with-count">
-                    <a href="https://github.com/sampotts/plyr" target="_blank" class="button" data-shr-network="github">
+                <div class="call-to-action">
+                    <a href="https://github.com/sampotts/plyr" target="_blank" class="button js-shr">
                         <svg class="icon" role="presentation">
                             <title>GitHub</title>
-                            <path 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
-               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
-               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"></path>
+                            <path
+                                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
+            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
+            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"
+                            ></path>
                         </svg>
                         Download on GitHub
                     </a>
-                </span>
-            </div>
-        </header>
+                </div>
+            </header>
 
-        <main>
-            <div id="container">
-                <video controls crossorigin playsinline poster="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg" id="player">
-                    <!-- Video files -->
-                    <source src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4" type="video/mp4" size="576">
-                    <source src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-720p.mp4" type="video/mp4" size="720">
-                    <source src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1080p.mp4" type="video/mp4" size="1080">
+            <main>
+                <div id="container">
+                    <video
+                        controls
+                        crossorigin
+                        playsinline
+                        poster="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg"
+                        id="player"
+                    >
+                        <!-- Video files -->
+                        <source
+                            src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4"
+                            type="video/mp4"
+                            size="576"
+                        />
+                        <source
+                            src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-720p.mp4"
+                            type="video/mp4"
+                            size="720"
+                        />
+                        <source
+                            src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1080p.mp4"
+                            type="video/mp4"
+                            size="1080"
+                        />
 
-                    <!-- Caption files -->
-                    <track kind="captions" label="English" srclang="en" src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt"
-                        default>
-                    <track kind="captions" label="Français" srclang="fr" src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.fr.vtt">
+                        <!-- Caption files -->
+                        <track
+                            kind="captions"
+                            label="English"
+                            srclang="en"
+                            src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt"
+                            default
+                        />
+                        <track
+                            kind="captions"
+                            label="Français"
+                            srclang="fr"
+                            src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.fr.vtt"
+                        />
 
-                    <!-- Fallback for browsers that don't support the <video> element -->
-                    <a href="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4" download>Download</a>
-                </video>
-            </div>
+                        <!-- Fallback for browsers that don't support the <video> element -->
+                        <a href="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4" download
+                            >Download</a
+                        >
+                    </video>
+                </div>
 
-            <ul>
-                <li class="plyr__cite plyr__cite--video" hidden>
-                    <small>
-                        <svg class="icon">
-                            <title>HTML5</title>
-                            <path d="M14.738.326C14.548.118 14.28 0 14 0H2c-.28 0-.55.118-.738.326S.98.81 1.004 1.09l1 11c.03.317.208.603.48.767l5 3c.16.095.338.143.516.143s.356-.048.515-.143l5-3c.273-.164.452-.45.48-.767l1-11c.026-.28-.067-.557-.257-.764zM12 4H6v2h6v5.72l-4 1.334-4-1.333V9h2v1.28l2 .666 2-.667V8H4V2h8v2z"></path>
-                        </svg>
-                        <a href="https://itunes.apple.com/au/movie/view-from-a-blue-moon/id1041586323" target="_blank">View From A Blue Moon</a> &copy; Brainfarm
-                    </small>
-                </li>
-                <li class="plyr__cite plyr__cite--audio" hidden>
-                    <small>
-                        <svg class="icon" title="HTML5">
-                            <title>HTML5</title>
-                            <path d="M14.738.326C14.548.118 14.28 0 14 0H2c-.28 0-.55.118-.738.326S.98.81 1.004 1.09l1 11c.03.317.208.603.48.767l5 3c.16.095.338.143.516.143s.356-.048.515-.143l5-3c.273-.164.452-.45.48-.767l1-11c.026-.28-.067-.557-.257-.764zM12 4H6v2h6v5.72l-4 1.334-4-1.333V9h2v1.28l2 .666 2-.667V8H4V2h8v2z"></path>
-                        </svg>
-                        <a href="http://www.kishibashi.com/" target="_blank">Kishi Bashi &ndash; &ldquo;It All Began With A Burst&rdquo;</a> &copy; Kishi Bashi
-                    </small>
-                </li>
-                <li class="plyr__cite plyr__cite--youtube" hidden>
-                    <small>
-                        <a href="https://www.youtube.com/watch?v=bTqVqk7FSmY" target="_blank">View From A Blue Moon</a> on&nbsp;
-                        <span class="color--youtube">
-                            <svg class="icon" role="presentation">
-                                <title>YouTube</title>
-                                <path d="M15.8,4.8c-0.2-1.3-0.8-2.2-2.2-2.4C11.4,2,8,2,8,2S4.6,2,2.4,2.4C1,2.6,0.3,3.5,0.2,4.8C0,6.1,0,8,0,8
+                <ul>
+                    <li class="plyr__cite plyr__cite--video" hidden>
+                        <small>
+                            <svg class="icon">
+                                <title>HTML5</title>
+                                <path
+                                    d="M14.738.326C14.548.118 14.28 0 14 0H2c-.28 0-.55.118-.738.326S.98.81 1.004 1.09l1 11c.03.317.208.603.48.767l5 3c.16.095.338.143.516.143s.356-.048.515-.143l5-3c.273-.164.452-.45.48-.767l1-11c.026-.28-.067-.557-.257-.764zM12 4H6v2h6v5.72l-4 1.334-4-1.333V9h2v1.28l2 .666 2-.667V8H4V2h8v2z"
+                                ></path>
+                            </svg>
+                            <a
+                                href="https://itunes.apple.com/au/movie/view-from-a-blue-moon/id1041586323"
+                                target="_blank"
+                                >View From A Blue Moon</a
+                            >
+                            &copy; Brainfarm
+                        </small>
+                    </li>
+                    <li class="plyr__cite plyr__cite--audio" hidden>
+                        <small>
+                            <svg class="icon" title="HTML5">
+                                <title>HTML5</title>
+                                <path
+                                    d="M14.738.326C14.548.118 14.28 0 14 0H2c-.28 0-.55.118-.738.326S.98.81 1.004 1.09l1 11c.03.317.208.603.48.767l5 3c.16.095.338.143.516.143s.356-.048.515-.143l5-3c.273-.164.452-.45.48-.767l1-11c.026-.28-.067-.557-.257-.764zM12 4H6v2h6v5.72l-4 1.334-4-1.333V9h2v1.28l2 .666 2-.667V8H4V2h8v2z"
+                                ></path>
+                            </svg>
+                            <a href="http://www.kishibashi.com/" target="_blank"
+                                >Kishi Bashi &ndash; &ldquo;It All Began With A Burst&rdquo;</a
+                            >
+                            &copy; Kishi Bashi
+                        </small>
+                    </li>
+                    <li class="plyr__cite plyr__cite--youtube" hidden>
+                        <small>
+                            <a href="https://www.youtube.com/watch?v=bTqVqk7FSmY" target="_blank"
+                                >View From A Blue Moon</a
+                            >
+                            on&nbsp;
+                            <span class="color--youtube">
+                                <svg class="icon" role="presentation">
+                                    <title>YouTube</title>
+                                    <path
+                                        d="M15.8,4.8c-0.2-1.3-0.8-2.2-2.2-2.4C11.4,2,8,2,8,2S4.6,2,2.4,2.4C1,2.6,0.3,3.5,0.2,4.8C0,6.1,0,8,0,8
                                    s0,1.9,0.2,3.2c0.2,1.3,0.8,2.2,2.2,2.4C4.6,14,8,14,8,14s3.4,0,5.6-0.4c1.4-0.3,2-1.1,2.2-2.4C16,9.9,16,8,16,8S16,6.1,15.8,4.8z
-                                    M6,11V5l5,3L6,11z"></path>
-                            </svg>YouTube
-                        </span>
-                    </small>
-                </li>
-                <li class="plyr__cite plyr__cite--vimeo" hidden>
-                    <small>
-                        <a href="https://vimeo.com/76979871" target="_blank">The New Vimeo Player</a> on&nbsp;
-                        <span class="color--vimeo">
-                            <svg class="icon" role="presentation">
-                                <title>Vimeo</title>
-                                <path d="M16,4.3c-0.1,1.6-1.2,3.7-3.3,6.4c-2.2,2.8-4,4.2-5.5,4.2c-0.9,0-1.7-0.9-2.4-2.6C4,9.9,3.4,5,2,5
+                                    M6,11V5l5,3L6,11z"
+                                    ></path></svg
+                                >YouTube
+                            </span>
+                        </small>
+                    </li>
+                    <li class="plyr__cite plyr__cite--vimeo" hidden>
+                        <small>
+                            <a href="https://vimeo.com/40648169" target="_blank">Toob “Wavaphon” Music Video</a>
+                            on&nbsp;
+                            <span class="color--vimeo">
+                                <svg class="icon" role="presentation">
+                                    <title>Vimeo</title>
+                                    <path
+                                        d="M16,4.3c-0.1,1.6-1.2,3.7-3.3,6.4c-2.2,2.8-4,4.2-5.5,4.2c-0.9,0-1.7-0.9-2.4-2.6C4,9.9,3.4,5,2,5
                                C1.9,5,1.5,5.3,0.8,5.8L0,4.8c0.8-0.7,3.5-3.4,4.7-3.5C5.9,1.2,6.7,2,7,3.8c0.3,2,0.8,6.1,1.8,6.1c0.9,0,2.5-3.4,2.6-4
-                               c0.1-0.9-0.3-1.9-2.3-1.1c0.8-2.6,2.3-3.8,4.5-3.8C15.3,1.1,16.1,2.2,16,4.3z"></path>
-                            </svg>Vimeo
-                        </span>
-                    </small>
-                </li>
-            </ul>
-        </main>
-    </div>
+                               c0.1-0.9-0.3-1.9-2.3-1.1c0.8-2.6,2.3-3.8,4.5-3.8C15.3,1.1,16.1,2.2,16,4.3z"
+                                    ></path></svg
+                                >Vimeo
+                            </span>
+                        </small>
+                    </li>
+                </ul>
+            </main>
+        </div>
 
-    <aside>
-        <svg class="icon">
-            <title>Twitter</title>
-            <path d="M16,3c-0.6,0.3-1.2,0.4-1.9,0.5c0.7-0.4,1.2-1,1.4-1.8c-0.6,0.4-1.3,0.6-2.1,0.8c-0.6-0.6-1.5-1-2.4-1
+        <aside>
+            <svg class="icon">
+                <title>Twitter</title>
+                <path
+                    d="M16,3c-0.6,0.3-1.2,0.4-1.9,0.5c0.7-0.4,1.2-1,1.4-1.8c-0.6,0.4-1.3,0.6-2.1,0.8c-0.6-0.6-1.5-1-2.4-1
        C9.3,1.5,7.8,3,7.8,4.8c0,0.3,0,0.5,0.1,0.7C5.2,5.4,2.7,4.1,1.1,2.1c-0.3,0.5-0.4,1-0.4,1.7c0,1.1,0.6,2.1,1.5,2.7
        c-0.5,0-1-0.2-1.5-0.4c0,0,0,0,0,0c0,1.6,1.1,2.9,2.6,3.2C3,9.4,2.7,9.4,2.4,9.4c-0.2,0-0.4,0-0.6-0.1c0.4,1.3,1.6,2.3,3.1,2.3
-       c-1.1,0.9-2.5,1.4-4.1,1.4c-0.3,0-0.5,0-0.8,0c1.5,0.9,3.2,1.5,5,1.5c6,0,9.3-5,9.3-9.3c0-0.1,0-0.3,0-0.4C15,4.3,15.6,3.7,16,3z"></path>
-        </svg>
-        <p>If you think Plyr's good,
-            <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" data-shr-network="twitter">tweet it</a> 👍
-        </p>
-    </aside>
+       c-1.1,0.9-2.5,1.4-4.1,1.4c-0.3,0-0.5,0-0.8,0c1.5,0.9,3.2,1.5,5,1.5c6,0,9.3-5,9.3-9.3c0-0.1,0-0.3,0-0.4C15,4.3,15.6,3.7,16,3z"
+                ></path>
+            </svg>
+            <p>
+                If you think Plyr's good,
+                <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"
+                    >tweet it</a
+                >
+                👍
+            </p>
+        </aside>
 
-    <!-- Polyfills -->
-    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6,Array.prototype.includes,CustomEvent,Object.entries,Object.values,URL"
-        crossorigin="anonymous"></script>
-
-    <!-- Plyr core script -->
-    <script src="../dist/plyr.js" crossorigin="anonymous"></script>
-
-    <!-- Sharing libary (https://shr.one) -->
-    <script src="https://cdn.shr.one/1.0.1/shr.js" crossorigin="anonymous"></script>
-
-    <!-- Rangetouch to fix <input type="range"> on touch devices (see https://rangetouch.com) -->
-    <script src="https://cdn.rangetouch.com/1.0.1/rangetouch.js" async crossorigin="anonymous"></script>
-
-    <!-- Docs script -->
-    <script src="dist/demo.js" crossorigin="anonymous"></script>
-</body>
-
-</html>
+        <script src="dist/demo.js" crossorigin="anonymous"></script>
+    </body>
+</html>

demo/package.json

@@ -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.6.4",
+        "custom-event-polyfill": "^1.0.7",
+        "raven-js": "^3.27.2",
+        "shr-buttons": "2.0.3",
+        "url-polyfill": "^1.1.8"
+    }
+}

demo/src/js/demo.js

@@ -4,7 +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;
@@ -16,52 +25,22 @@ import Raven from 'raven-js';
     document.addEventListener('DOMContentLoaded', () => {
         Raven.context(() => {
             const selector = '#player';
-            const container = document.getElementById('container');
 
-            if (window.shr) {
-                window.shr.setup({
-                    count: {
-                        classname: 'button__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 share buttons
+            Shr.setup('.js-shr', {
+                count: {
+                    className: 'button__count',
+                },
+                wrapper: {
+                    className: 'button--with-count',
+                },
             });
 
             // Setup the player
             const player = new Plyr(selector, {
                 debug: true,
                 title: 'View From A Blue Moon',
-                iconUrl: '../dist/plyr.svg',
+                iconUrl: 'dist/demo.svg',
                 keyboard: {
                     global: true,
                 },
@@ -71,13 +50,21 @@ import Raven from 'raven-js';
                 captions: {
                     active: true,
                 },
-                keys: {
-                    google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c',
-                },
                 ads: {
                     enabled: env.prod || env.dev,
                     publisherId: '918848828995742',
                 },
+                previewThumbnails: {
+                    enabled: true,
+                    src: [
+                        'https://cdn.plyr.io/static/demo/thumbs/100p.vtt',
+                        'https://cdn.plyr.io/static/demo/thumbs/240p.vtt',
+                    ],
+                },
+                vimeo: {
+                    // Prevent Vimeo blocking plyr.io demo site
+                    referrerPolicy: 'no-referrer',
+                },
             });
 
             // Expose for tinkering in the console
@@ -85,131 +72,12 @@ import Raven from 'raven-js';
 
             // Setup type toggle
             const buttons = document.querySelectorAll('[data-source]');
-            const types = {
-                video: 'video',
-                audio: 'audio',
-                youtube: 'youtube',
-                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 – “It All Began With A Burst”',
-                            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;
+            const types = Object.keys(sources);
+            const historySupport = Boolean(window.history && window.history.pushState);
+            let currentType = window.location.hash.substring(1);
+            const hasCurrentType = !currentType.length;
 
+            function render(type) {
                 // Remove active classes
                 Array.from(buttons).forEach(button => toggleClass(button.parentElement, 'active', false));
 
@@ -218,9 +86,31 @@ import Raven from 'raven-js';
 
                 // 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
@@ -228,7 +118,7 @@ import Raven from 'raven-js';
                 button.addEventListener('click', () => {
                     const type = button.getAttribute('data-source');
 
-                    newSource(type);
+                    setSource(type);
 
                     if (historySupport) {
                         window.history.pushState({ type }, '', `#${type}`);
@@ -238,36 +128,27 @@ import Raven from 'raven-js';
 
             // List for backwards/forwards
             window.addEventListener('popstate', event => {
-                if (event.state && 'type' in event.state) {
-                    newSource(event.state.type);
+                if (event.state && Object.keys(event.state).includes('type')) {
+                    setSource(event.state.type);
                 }
             });
 
-            // On load
-            if (historySupport) {
-                const video = !currentType.length;
-
-                // 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);
-                }
+            // If there's no current type set, assume video
+            if (hasCurrentType) {
+                currentType = 'video';
             }
+
+            // 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);
         });
     });
 
@@ -276,27 +157,4 @@ import Raven from 'raven-js';
     if (env.prod) {
         Raven.config('https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555').install();
     }
-
-    // Google analytics
-    // For demo site (https://plyr.io) only
-    /* eslint-disable */
-    if (env.prod) {
-        ((i, s, o, g, r, a, m) => {
-            i.GoogleAnalyticsObject = r;
-            i[r] =
-                i[r] ||
-                function() {
-                    (i[r].q = i[r].q || []).push(arguments);
-                };
-            i[r].l = 1 * new Date();
-            a = s.createElement(o);
-            m = s.getElementsByTagName(o)[0];
-            a.async = 1;
-            a.src = g;
-            m.parentNode.insertBefore(a, m);
-        })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
-        window.ga('create', 'UA-40881672-11', 'auto');
-        window.ga('send', 'pageview');
-    }
-    /* eslint-enable */
 })();

demo/src/js/sources.js

@@ -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 – “It All Began With A Burst”',
+        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/40648169',
+                provider: 'vimeo',
+            },
+        ],
+    },
+};
+
+export default sources;

demo/src/js/tab-focus.js

@@ -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);
+});

demo/src/js/toggle-class.js

@@ -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;

demo/src/sass/components/buttons.scss

@@ -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-right: $spacing-base;
+    padding-left: ($spacing-base * 1.25);
+    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;

demo/src/sass/components/header.scss

@@ -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);
+        }
     }
 }

demo/src/sass/components/icons.scss

@@ -19,5 +19,5 @@ label svg {
 
 a .icon,
 .btn .icon {
-    margin-right: floor($spacing-base / 3);
+    margin-right: ($spacing-base / 2);
 }

demo/src/sass/components/links.scss

@@ -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;

demo/src/sass/components/players.scss

@@ -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;
-    margin-top: $spacing-base;
+    color: $color-gray-5;
 
     .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;
-}

demo/src/sass/layout/core.scss

@@ -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;

demo/src/sass/lib/animation.scss

@@ -11,3 +11,17 @@
         opacity: 1;
     }
 }
+
+@keyframes shrinkHide {
+    0% {
+        opacity: 0.5;
+        width: 38px;
+    }
+    20% {
+        width: 45px;
+    }
+    100% {
+        opacity: 0;
+        width: 0;
+    }
+}

demo/src/sass/lib/fontface.scss

@@ -7,7 +7,8 @@
     font-family: 'Gordita';
     font-style: normal;
     font-weight: $font-weight-light;
-    src: url('https://cdn.plyr.io/static/fonts/gordita-light.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/gordita-light.woff') format('woff');
+    src: url('https://cdn.plyr.io/static/fonts/gordita-light.woff2') format('woff2'),
+        url('https://cdn.plyr.io/static/fonts/gordita-light.woff') format('woff');
 }
 
 @font-face {
@@ -33,7 +34,8 @@
     font-family: 'Gordita';
     font-style: normal;
     font-weight: $font-weight-bold;
-    src: url('https://cdn.plyr.io/static/fonts/gordita-bold.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/gordita-bold.woff') format('woff');
+    src: url('https://cdn.plyr.io/static/fonts/gordita-bold.woff2') format('woff2'),
+        url('https://cdn.plyr.io/static/fonts/gordita-bold.woff') format('woff');
 }
 
 @font-face {
@@ -41,5 +43,6 @@
     font-family: 'Gordita';
     font-style: normal;
     font-weight: $font-weight-black;
-    src: url('https://cdn.plyr.io/static/fonts/gordita-black.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/gordita-black.woff') format('woff');
+    src: url('https://cdn.plyr.io/static/fonts/gordita-black.woff2') format('woff2'),
+        url('https://cdn.plyr.io/static/fonts/gordita-black.woff') format('woff');
 }

demo/src/sass/lib/mixins.scss

@@ -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);
 }

demo/src/sass/settings/colors.scss

@@ -2,31 +2,41 @@
 // Colors
 // ==========================================================================
 
-// Greyscale
-$gray-dark: #343f4a;
-$gray: #55646b;
-$gray-light: #cbd0d3;
-$gray-lighter: #dbe3e8;
-$off-white: #f2f5f7;
+// Grayscale
+$color-gray-9: hsl(210, 15%, 16%);
+$color-gray-8: lighten($color-gray-9, 9%);
+$color-gray-7: lighten($color-gray-8, 9%);
+$color-gray-6: lighten($color-gray-7, 9%);
+$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;
-
-// Plyr
-$color-brand-primary: #1aafff;
+$color-text: $color-gray-7;
+$color-headings: $color-brand-primary;
 
 // Brands
 $color-twitter: #4baaf4;
-$color-youtube: #cc181e;
-$color-vimeo: #19b7ed;
 
 // Elements
-$color-link: #fff;
-$color-background: $color-brand-primary;
+$color-link: $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-text: $gray;
+$color-button-background: $color-brand-primary;
+$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;

demo/src/sass/settings/cosmetic.scss

@@ -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);

demo/src/sass/settings/plyr.scss

@@ -11,6 +11,12 @@ $plyr-font-size-small: 12px;
 $plyr-font-size-time: 11px;
 $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;

demo/src/sass/settings/spacing.scss

@@ -2,4 +2,4 @@
 // Colors
 // ==========================================================================
 
-$spacing-base: 20px;
+$spacing-base: 16px;

demo/src/sass/type/base.scss

@@ -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 {

demo/src/sass/type/headings.scss

@@ -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);
 }

demo/yarn.lock

@@ -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==

deploy.json

@@ -0,0 +1,12 @@
+{
+    "cdn": {
+        "bucket": "plyr",
+        "domain": "cdn.plyr.io",
+        "region": "us-east-1"
+    },
+    "demo": {
+        "bucket": "plyr.io",
+        "domain": "plyr.io",
+        "region": "us-west-1"
+    }
+}

gulpfile.js

@@ -1,237 +1,273 @@
 // ==========================================================================
 // Gulp build script
 // ==========================================================================
-/* global require, __dirname */
 /* eslint no-console: "off" */
 
-const del = require('del');
 const path = require('path');
 const gulp = require('gulp');
-const gutil = require('gulp-util');
-const concat = require('gulp-concat');
-const filter = require('gulp-filter');
-const sass = require('gulp-sass');
-const cleancss = require('gulp-clean-css');
-const run = require('run-sequence');
-const header = require('gulp-header');
-const prefix = require('gulp-autoprefixer');
-const gitbranch = require('git-branch');
-const svgstore = require('gulp-svgstore');
-const svgmin = require('gulp-svgmin');
-const rename = require('gulp-rename');
-const s3 = require('gulp-s3');
-const replace = require('gulp-replace');
-const open = require('gulp-open');
-const size = require('gulp-size');
+// ------------------------------------
+// JavaScript
+// ------------------------------------
+const terser = require('gulp-terser');
 const rollup = require('gulp-better-rollup');
 const babel = require('rollup-plugin-babel');
-const sourcemaps = require('gulp-sourcemaps');
-const uglify = require('gulp-uglify-es').default;
 const commonjs = require('rollup-plugin-commonjs');
 const resolve = require('rollup-plugin-node-resolve');
-const FastlyPurge = require('fastly-purge');
+// ------------------------------------
+// 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');
+const gitbranch = require('git-branch');
+const rename = require('gulp-rename');
+const replace = require('gulp-replace');
+const ansi = require('ansi-colors');
+const log = require('fancy-log');
+const open = require('gulp-open');
+const plumber = require('gulp-plumber');
+const size = require('gulp-size');
+const sourcemaps = require('gulp-sourcemaps');
 const through = require('through2');
-
-const bundles = require('./bundles.json');
+const browserSync = require('browser-sync').create();
+// ------------------------------------
+// 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
+Object.values(deploy).forEach(target => {
+    Object.assign(target, {
+        publisher: publish.create({
+            region: target.region,
+            params: {
+                Bucket: target.bucket,
+            },
+            credentials: new aws.SharedIniFileCredentials({ profile: 'plyr' }),
+        }),
+    });
+});
+
 // Paths
-const root = __dirname;
 const paths = {
     plyr: {
         // Source paths
         src: {
-            sass: path.join(root, 'src/sass/**/*.scss'),
-            js: path.join(root, 'src/js/**/*'),
-            sprite: path.join(root, 'src/sprite/*.svg'),
+            sass: path.join(__dirname, 'src/sass/**/*.scss'),
+            js: path.join(__dirname, 'src/js/**/*.js'),
+            sprite: path.join(__dirname, 'src/sprite/*.svg'),
         },
 
         // Output paths
-        output: path.join(root, 'dist/'),
+        output: path.join(__dirname, 'dist/'),
     },
     demo: {
         // Source paths
         src: {
-            sass: path.join(root, 'demo/src/sass/**/*.scss'),
-            js: path.join(root, 'demo/src/js/**/*'),
+            sass: path.join(__dirname, 'demo/src/sass/**/*.scss'),
+            js: path.join(__dirname, 'demo/src/js/**/*.js'),
         },
 
         // Output paths
-        output: path.join(root, 'demo/dist/'),
+        output: path.join(__dirname, 'demo/dist/'),
 
         // Demo
-        root: path.join(root, 'demo/'),
+        root: path.join(__dirname, 'demo/'),
     },
     upload: [
-        path.join(root, `dist/*${minSuffix}.*`),
-        path.join(root, 'dist/*.css'),
-        path.join(root, 'dist/*.svg'),
-        path.join(root, `demo/dist/*${minSuffix}.*`),
-        path.join(root, 'demo/dist/*.css'),
+        path.join(__dirname, `dist/*${minSuffix}.*`),
+        path.join(__dirname, 'dist/*.css'),
+        path.join(__dirname, 'dist/*.svg'),
+        path.join(__dirname, `demo/dist/*${minSuffix}.*`),
+        path.join(__dirname, 'demo/dist/*.css'),
+        path.join(__dirname, 'demo/dist/*.svg'),
     ],
 };
 
 // Task arrays
 const tasks = {
-    sass: [],
+    css: [],
     js: [],
     sprite: [],
-    clean: ['clean'],
+    clean: 'clean',
 };
 
 // Size plugin
 const sizeOptions = { showFiles: true, gzip: true };
 
-// Browserlist
-const browsers = ['> 1%'];
-
-// Babel config
-const babelrc = {
-    presets: [
-        [
-            'env',
-            {
-                targets: {
-                    browsers,
-                },
-                useBuiltIns: true,
-                modules: false,
-            },
-        ],
-    ],
-    plugins: ['external-helpers'],
-    babelrc: false,
-    exclude: 'node_modules/**',
-};
-
 // Clean out /dist
-gulp.task('clean', () => {
-    const dirs = [paths.plyr.output, paths.demo.output].map(dir =>
-        path.join(dir, '**/*'),
-    );
+gulp.task(tasks.clean, done => {
+    const dirs = [paths.plyr.output, paths.demo.output].map(dir => path.join(dir, '**/*'));
 
     // Don't delete the mp4
     dirs.push(`!${path.join(paths.plyr.output, '**/*.mp4')}`);
 
     del(dirs);
+
+    done();
 });
 
-const build = {
-    js(files, bundle, options) {
-        Object.keys(files).forEach(key => {
-            const name = `js:${key}`;
-            tasks.js.push(name);
-            const { output } = paths[bundle];
+// JavaScript
+Object.entries(build.js).forEach(([filename, entry]) => {
+    const { dist, formats, namespace, polyfill, src } = entry;
 
-            return gulp.task(name, () =>
-                gulp
-                    .src(bundles[bundle].js[key])
-                    .pipe(sourcemaps.init())
-                    .pipe(concat(key))
-                    .pipe(
-                        rollup(
-                            {
-                                plugins: [
-                                    resolve(),
-                                    commonjs(),
-                                    babel(babelrc),
-                                ],
-                            },
-                            options,
-                        ),
-                    )
-                    .pipe(header('typeof navigator === "object" && ')) // "Support" SSR (#935)
-                    .pipe(sourcemaps.write(''))
-                    .pipe(gulp.dest(output))
-                    .pipe(filter('**/*.js'))
-                    .pipe(uglify())
-                    .pipe(size(sizeOptions))
-                    .pipe(rename({ suffix: minSuffix }))
-                    .pipe(sourcemaps.write(''))
-                    .pipe(gulp.dest(output)),
-            );
-        });
-    },
-    sass(files, bundle) {
-        Object.keys(files).forEach(key => {
-            const name = `sass:${key}`;
-            tasks.sass.push(name);
+    formats.forEach(format => {
+        const name = `js:${filename}:${format}`;
+        const extension = format === 'es' ? 'mjs' : 'js';
+        tasks.js.push(name);
 
-            return gulp.task(name, () =>
-                gulp
-                    .src(bundles[bundle].sass[key])
-                    .pipe(sass())
-                    .on('error', gutil.log)
-                    .pipe(concat(key))
-                    .pipe(prefix(browsers, { cascade: false }))
-                    .pipe(cleancss())
-                    .pipe(size(sizeOptions))
-                    .pipe(gulp.dest(paths[bundle].output)),
-            );
-        });
-    },
-    sprite(bundle) {
-        const name = `svg:sprite:${bundle}`;
-        tasks.sprite.push(name);
-
-        // Process Icons
-        return gulp.task(name, () =>
+        gulp.task(name, () =>
             gulp
-                .src(paths[bundle].src.sprite)
+                .src(src)
+                .pipe(plumber())
+                .pipe(sourcemaps.init())
                 .pipe(
-                    svgmin({
-                        plugins: [
-                            {
-                                removeDesc: true,
-                            },
-                        ],
+                    rollup(
+                        {
+                            plugins: [
+                                resolve(),
+                                commonjs(),
+                                babel({
+                                    presets: [
+                                        [
+                                            '@babel/env',
+                                            {
+                                                // debug: true,
+                                                useBuiltIns: polyfill ? 'usage' : false,
+                                                corejs: polyfill ? 3 : undefined,
+                                            },
+                                        ],
+                                    ],
+                                    babelrc: false,
+                                    exclude: [/\/core-js\//],
+                                }),
+                            ],
+                        },
+                        {
+                            name: namespace,
+                            format,
+                        },
+                    ),
+                )
+                .pipe(header('typeof navigator === "object" && ')) // "Support" SSR (#935)
+                .pipe(
+                    rename({
+                        extname: `.${extension}`,
                     }),
                 )
-                .pipe(svgstore())
-                .pipe(rename({ basename: bundle }))
+                .pipe(gulp.dest(dist))
+                .pipe(filter(`**/*.${extension}`))
+                .pipe(terser())
+                .pipe(rename({ suffix: minSuffix }))
                 .pipe(size(sizeOptions))
-                .pipe(gulp.dest(paths[bundle].output)),
+                .pipe(sourcemaps.write(''))
+                .pipe(gulp.dest(dist)),
         );
-    },
-};
+    });
+});
 
-// Plyr core files
-build.js(bundles.plyr.js, 'plyr', { name: 'Plyr', format: 'umd' });
-build.sass(bundles.plyr.sass, 'plyr');
-build.sprite('plyr');
+// CSS
+Object.entries(build.css).forEach(([filename, entry]) => {
+    const { dist, src } = entry;
+    const name = `css:${filename}`;
+    tasks.css.push(name);
 
-// Demo files
-build.sass(bundles.demo.sass, 'demo');
-build.js(bundles.demo.js, 'demo', { format: 'iife' });
+    gulp.task(name, () =>
+        gulp
+            .src(src)
+            .pipe(plumber())
+            .pipe(sass())
+            .pipe(
+                prefix(browsers, {
+                    cascade: false,
+                }),
+            )
+            .pipe(clean())
+            .pipe(size(sizeOptions))
+            .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(src)
+            .pipe(plumber())
+            .pipe(
+                imagemin([
+                    imagemin.svgo({
+                        plugins: [{ removeViewBox: false }],
+                    }),
+                ]),
+            )
+            .pipe(svgstore())
+            .pipe(rename({ basename: path.parse(filename).name }))
+            .pipe(size(sizeOptions))
+            .pipe(gulp.dest(dist)),
+    );
+});
 
 // Build all JS
-gulp.task('js', () => {
-    run(tasks.js);
-});
+gulp.task('js', () => gulp.parallel(...tasks.js));
 
 // Watch for file changes
 gulp.task('watch', () => {
     // Plyr core
-    gulp.watch(paths.plyr.src.js, tasks.js);
-    gulp.watch(paths.plyr.src.sass, tasks.sass);
-    gulp.watch(paths.plyr.src.sprite, tasks.sprite);
+    gulp.watch(paths.plyr.src.js, gulp.parallel(...tasks.js));
+    gulp.watch(paths.plyr.src.sass, gulp.parallel(...tasks.css));
+    gulp.watch(paths.plyr.src.sprite, gulp.parallel(...tasks.sprite));
 
     // Demo
-    gulp.watch(paths.demo.src.js, tasks.js);
-    gulp.watch(paths.demo.src.sass, tasks.sass);
+    gulp.watch(paths.demo.src.js, gulp.parallel(...tasks.js));
+    gulp.watch(paths.demo.src.sass, gulp.parallel(...tasks.css));
 });
 
+// Serve via browser sync
+gulp.task('serve', () =>
+    browserSync.init({
+        server: {
+            baseDir: paths.demo.root,
+        },
+        notify: false,
+        watch: true,
+        ghostMode: false,
+    }),
+);
+
 // Build distribution
-gulp.task('build', () => {
-    run(tasks.clean, tasks.js, tasks.sass, tasks.sprite);
-});
+gulp.task('build', gulp.series(tasks.clean, gulp.parallel(...tasks.js, ...tasks.css, ...tasks.sprite)));
 
 // Default gulp task
-gulp.task('default', () => {
-    run('build', 'watch');
-});
+gulp.task('default', gulp.series('build', gulp.parallel('serve', 'watch')));
 
 // Publish a version to CDN and demo
 // --------------------------------------------
@@ -243,241 +279,244 @@ try {
     // Do nothing
 }
 
-// If deployment is setup
-if (
-    Object.keys(credentials).includes('aws') &&
-    Object.keys(credentials).includes('fastly')
-) {
-    const { version } = pkg;
-    const { aws, fastly } = credentials;
+// Get branch info
+const branch = {
+    current: gitbranch.sync(),
+    master: 'master',
+    beta: 'beta',
+};
 
-    // Get branch info
-    const branch = {
-        current: gitbranch.sync(),
-        master: 'master',
-        develop: 'develop',
-    };
-
-    const maxAge = 31536000; // 1 year
-    const options = {
-        cdn: {
+const maxAge = 31536000; // 1 year
+const options = {
+    cdn: {
+        headers: {
+            'Cache-Control': `max-age=${maxAge}`,
+        },
+    },
+    demo: {
+        uploadPath: branch.current === branch.beta ? '/beta' : null,
+        headers: {
+            'Cache-Control': 'no-cache, no-store, must-revalidate, max-age=0',
+        },
+    },
+    symlinks(ver, filename) {
+        return {
             headers: {
-                'Cache-Control': `max-age=${maxAge}`,
-                Vary: 'Accept-Encoding',
+                // http://stackoverflow.com/questions/2272835/amazon-s3-object-redirect
+                'x-amz-website-redirect-location': `/${ver}/${filename}`,
+                'Cache-Control': 'no-cache, no-store, must-revalidate, max-age=0',
             },
-        },
-        demo: {
-            uploadPath: branch.current === branch.develop ? 'beta/' : null,
-            headers: {
-                'Cache-Control':
-                    'no-cache, no-store, must-revalidate, max-age=0',
-                Vary: 'Accept-Encoding',
-            },
-        },
-        symlinks(ver, filename) {
-            return {
-                headers: {
-                    // http://stackoverflow.com/questions/2272835/amazon-s3-object-redirect
-                    'x-amz-website-redirect-location': `/${ver}/${filename}`,
-                    'Cache-Control':
-                        'no-cache, no-store, must-revalidate, max-age=0',
-                },
-            };
-        },
-    };
+        };
+    },
+};
 
-    const regex =
-        '(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*).(?:0|[1-9][0-9]*)(?:-[\\da-z\\-]+(?:.[\\da-z\\-]+)*)?(?:\\+[\\da-z\\-]+(?:.[\\da-z\\-]+)*)?';
-    const semver = new RegExp(`v${regex}`, 'gi');
-    const localPath = new RegExp('(../)?dist', 'gi');
-    const versionPath = `https://${aws.cdn.domain}/${version}`;
-    const cdnpath = new RegExp(`${aws.cdn.domain}/${regex}/`, 'gi');
+const regex =
+    '(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*).(?:0|[1-9][0-9]*)(?:-[\\da-z\\-]+(?:.[\\da-z\\-]+)*)?(?:\\+[\\da-z\\-]+(?:.[\\da-z\\-]+)*)?';
+const semver = new RegExp(`v${regex}`, 'gi');
+const localPath = new RegExp('(../)?dist', 'gi');
+const versionPath = `https://${deploy.cdn.domain}/${version}`;
+const cdnpath = new RegExp(`${deploy.cdn.domain}/${regex}/`, 'gi');
 
-    const renameFile = rename(p => {
-        p.basename = p.basename.replace(minSuffix, ''); // eslint-disable-line
-        p.dirname = p.dirname.replace('.', version); // eslint-disable-line
-    });
+const renameFile = rename(p => {
+    p.basename = p.basename.replace(minSuffix, ''); // eslint-disable-line
+    p.dirname = p.dirname.replace('.', version); // eslint-disable-line
+});
 
-    // Check we're on the correct branch to deploy
-    const canDeploy = () => {
-        const allowed = [branch.master, branch.develop];
+// Check we're on the correct branch to deploy
+const canDeploy = () => {
+    const allowed = [branch.master, branch.beta];
 
-        if (!allowed.includes(branch.current)) {
-            console.error(
-                `Must be on ${allowed.join(', ')} to publish! (current: ${
-                    branch.current
-                })`,
-            );
+    if (!allowed.includes(branch.current)) {
+        console.error(`Must be on ${allowed.join(', ')} to publish! (current: ${branch.current})`);
 
-            return false;
-        }
+        return false;
+    }
 
-        return true;
-    };
+    return true;
+};
 
-    gulp.task('version', () => {
-        if (!canDeploy()) {
-            return null;
-        }
+gulp.task('version', done => {
+    if (!canDeploy()) {
+        done();
+        return null;
+    }
 
-        console.log(`Updating versions to '${version}'...`);
+    const { domain } = deploy.cdn;
 
-        // Replace versioned URLs in source
-        const files = ['plyr.js', 'plyr.polyfilled.js', 'defaults.js'];
+    log(`Uploading ${ansi.green.bold(version)} to ${ansi.cyan(domain)}...`);
 
-        return gulp
-            .src(files.map(file => path.join(root, `src/js/${file}`)))
-            .pipe(replace(semver, `v${version}`))
-            .pipe(replace(cdnpath, `${aws.cdn.domain}/${version}/`))
-            .pipe(gulp.dest(path.join(root, 'src/js/')));
-    });
+    // Replace versioned URLs in source
+    const files = ['plyr.js', 'plyr.polyfilled.js', 'config/defaults.js'];
 
-    // Publish version to CDN bucket
-    gulp.task('cdn', () => {
-        if (!canDeploy()) {
-            return null;
-        }
+    return gulp
+        .src(
+            files.map(file => path.join(__dirname, `src/js/${file}`)),
+            { base: '.' },
+        )
+        .pipe(replace(semver, `v${version}`))
+        .pipe(replace(cdnpath, `${domain}/${version}/`))
+        .pipe(gulp.dest('./'));
+});
 
-        console.log(`Uploading '${version}' to ${aws.cdn.domain}...`);
+// Publish version to CDN bucket
+gulp.task('cdn', done => {
+    if (!canDeploy()) {
+        done();
+        return null;
+    }
 
-        // Upload to CDN
-        return (
-            gulp
-                .src(paths.upload)
-                .pipe(renameFile)
-                // Remove min suffix from source map URL
-                .pipe(
-                    replace(
-                        /sourceMappingURL=([\w-?.]+)/,
-                        (match, p1) =>
-                            `sourceMappingURL=${p1.replace(minSuffix, '')}`,
-                    ),
-                )
-                .pipe(
-                    size({
-                        showFiles: true,
-                        gzip: true,
-                    }),
-                )
-                .pipe(replace(localPath, versionPath))
-                .pipe(s3(aws.cdn, options.cdn))
-        );
-    });
+    const { domain, publisher } = deploy.cdn;
 
-    // Purge the fastly cache incase any 403/404 are cached
-    gulp.task('purge', () => {
-        const list = [];
+    if (!publisher) {
+        throw new Error('No publisher instance. Check AWS configuration.');
+    }
 
-        return gulp.src(paths.upload).pipe(
+    log(`Uploading ${ansi.green.bold(pkg.version)} to ${ansi.cyan(domain)}...`);
+
+    // Upload to CDN
+    return (
+        gulp
+            .src(paths.upload)
+            .pipe(renameFile)
+            // Remove min suffix from source map URL
+            .pipe(
+                replace(
+                    /sourceMappingURL=([\w-?.]+)/,
+                    (match, filename) => `sourceMappingURL=${filename.replace(minSuffix, '')}`,
+                ),
+            )
+            .pipe(size(sizeOptions))
+            .pipe(replace(localPath, versionPath))
+            .pipe(publisher.publish(options.cdn.headers))
+            .pipe(publish.reporter())
+    );
+});
+
+// Purge the fastly cache incase any 403/404 are cached
+gulp.task('purge', () => {
+    if (!Object.keys(credentials).includes('fastly')) {
+        throw new Error('Fastly credentials required to purge cache.');
+    }
+
+    const { fastly } = credentials;
+    const list = [];
+
+    return gulp
+        .src(paths.upload)
+        .pipe(
             through.obj((file, enc, cb) => {
                 const filename = file.path.split('/').pop();
-                list.push(`${versionPath}/${filename}`);
+                list.push(`${versionPath}/${filename.replace(minSuffix, '')}`);
                 cb(null);
             }),
-        ).on('end', () => {
+        )
+        .on('end', () => {
             const purge = new FastlyPurge(fastly.token);
 
             list.forEach(url => {
-                console.log(`Purging ${url}...`);
+                log(`Purging ${ansi.cyan(url)}...`);
 
                 purge.url(url, (error, result) => {
                     if (error) {
-                        console.log(error);
+                        log.error(error);
                     } else if (result) {
-                        console.log(result);
+                        log(result);
                     }
                 });
             });
         });
-    });
+});
 
-    // Publish to demo bucket
-    gulp.task('demo', () => {
-        if (!canDeploy()) {
-            return null;
-        }
+// Publish to demo bucket
+gulp.task('demo', done => {
+    if (!canDeploy()) {
+        done();
+        return null;
+    }
 
-        console.log(`Uploading '${version}' demo to ${aws.demo.domain}...`);
+    const { publisher } = deploy.demo;
+    const { domain } = deploy.cdn;
 
-        // Replace versioned files in readme.md
-        gulp
-            .src([`${root}/readme.md`])
-            .pipe(replace(cdnpath, `${aws.cdn.domain}/${version}/`))
-            .pipe(gulp.dest(root));
+    if (!publisher) {
+        throw new Error('No publisher instance. Check AWS configuration.');
+    }
 
-        // Replace local file paths with remote paths in demo HTML
-        // e.g. "../dist/plyr.js" to "https://cdn.plyr.io/x.x.x/plyr.js"
-        const index = `${paths.demo.root}index.html`;
-        const error = `${paths.demo.root}error.html`;
-        const pages = [index];
+    log(`Uploading ${ansi.green.bold(pkg.version)} to ${ansi.cyan(domain)}...`);
 
-        if (branch.current === branch.master) {
-            pages.push(error);
-        }
+    // Replace versioned files in readme.md
+    gulp.src([`${__dirname}/readme.md`])
+        .pipe(replace(cdnpath, `${domain}/${version}/`))
+        .pipe(gulp.dest(__dirname));
 
-        gulp
-            .src(pages)
-            .pipe(replace(localPath, versionPath))
-            .pipe(s3(aws.demo, options.demo));
+    // Replace local file paths with remote paths in demo HTML
+    // e.g. "../dist/plyr.js" to "https://cdn.plyr.io/x.x.x/plyr.js"
+    const index = `${paths.demo.root}index.html`;
+    const error = `${paths.demo.root}error.html`;
+    const pages = [index];
 
-        // Only update CDN for master (prod)
-        if (branch.current !== branch.master) {
-            return null;
-        }
+    if (branch.current === branch.master) {
+        pages.push(error);
+    }
 
-        // Upload error.html to cdn (as well as demo site)
-        return gulp
-            .src([error])
-            .pipe(replace(localPath, versionPath))
-            .pipe(s3(aws.cdn, options.demo));
-    });
-
-    // Update symlinks for latest
-    /* gulp.task("symlinks", function () {
-        console.log("Updating symlinks...");
-
-        return gulp.src(paths.upload)
-            .pipe(through.obj(function (chunk, enc, callback) {
-                if (chunk.stat.isFile()) {
-                    // Get the filename
-                    var filename = chunk.path.split("/").reverse()[0];
-
-                    // Create the 0 byte redirect files to upload
-                    createFile(filename, "")
-                        .pipe(rename(function (path) {
-                            path.dirname = path.dirname.replace(".", "latest");
-                        }))
-                        // Upload to S3 with correct headers
-                        .pipe(s3(aws.cdn, options.symlinks(version, filename)));
+    return gulp
+        .src(pages)
+        .pipe(replace(localPath, versionPath))
+        .pipe(
+            rename(p => {
+                if (options.demo.uploadPath) {
+                    // eslint-disable-next-line no-param-reassign
+                    p.dirname += options.demo.uploadPath;
                 }
-
-                callback(null, chunk);
-            }));
-    }); */
-
-    // Open the demo site to check it's ok
-    gulp.task('open', callback => {
-        gulp.src(__filename).pipe(
-            open({
-                uri: `https://${aws.demo.domain}`,
             }),
-        );
+        )
+        .pipe(publisher.publish(options.demo.headers))
+        .pipe(publish.reporter());
+});
 
-        callback();
-    });
+gulp.task('error', done => {
+    // Only update CDN for master (prod)
+    if (!canDeploy() || branch.current !== branch.master) {
+        done();
+        return null;
+    }
 
-    // Do everything
-    gulp.task('deploy', () =>
-        run(
-            'version',
-            tasks.clean,
-            tasks.js,
-            tasks.sass,
-            tasks.sprite,
-            'cdn',
-            'purge',
-            'demo',
-            'open',
-        ),
+    const { publisher } = deploy.cdn;
+
+    if (!publisher) {
+        throw new Error('No publisher instance. Check AWS configuration.');
+    }
+
+    // Replace local file paths with remote paths in demo HTML
+    // e.g. "../dist/plyr.js" to "https://cdn.plyr.io/x.x.x/plyr.js"
+    // Upload error.html to cdn
+    return gulp
+        .src(`${paths.demo.root}error.html`)
+        .pipe(replace(localPath, versionPath))
+        .pipe(publisher.publish(options.demo.headers))
+        .pipe(publish.reporter());
+});
+
+// Open the demo site to check it's ok
+gulp.task('open', () => {
+    const { domain } = deploy.demo;
+
+    return gulp.src(__filename).pipe(
+        open({
+            uri: `https://${domain}/${branch.current === branch.beta ? 'beta' : ''}`,
+        }),
     );
-}
+});
+
+// Do everything
+gulp.task(
+    'deploy',
+    gulp.series(
+        'version',
+        tasks.clean,
+        gulp.parallel(...tasks.js, ...tasks.css, ...tasks.sprite),
+        'cdn',
+        'demo',
+        'purge',
+        'open',
+    ),
+);

package.json

@@ -1,14 +1,25 @@
 {
     "name": "plyr",
-    "version": "3.4.2",
+    "version": "3.5.9",
     "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
     "homepage": "https://plyr.io",
     "author": "Sam Potts <sam@potts.es>",
-    "keywords": ["HTML5 Video", "HTML5 Audio", "Media Player", "DASH", "Shaka", "WordPress", "HLS"],
-    "main": "./dist/plyr.js",
-    "browser": "./dist/plyr.min.js",
-    "sass": "./src/sass/plyr.scss",
-    "style": "./dist/plyr.css",
+    "main": "dist/plyr.js",
+    "types": "src/js/plyr.d.ts",
+    "module": "dist/plyr.min.mjs",
+    "jsnext:main": "dist/plyr.min.mjs",
+    "browser": "dist/plyr.min.js",
+    "sass": "src/sass/plyr.scss",
+    "style": "dist/plyr.css",
+    "keywords": [
+        "HTML5 Video",
+        "HTML5 Audio",
+        "Media Player",
+        "DASH",
+        "Shaka",
+        "WordPress",
+        "HLS"
+    ],
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -17,69 +28,71 @@
     "bugs": {
         "url": "https://github.com/sampotts/plyr/issues"
     },
-    "directories": {
-        "doc": "readme.md"
-    },
+    "browserslist": "> 1%",
     "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'",
-        "test": "echo \"Error: no test specified\" && exit 1"
+        "deploy": "yarn lint && gulp deploy"
     },
     "devDependencies": {
-        "babel-core": "^6.26.3",
-        "babel-eslint": "^8.2.6",
-        "babel-plugin-external-helpers": "^6.22.0",
-        "babel-preset-env": "^1.7.0",
-        "del": "^3.0.0",
-        "eslint": "^5.3.0",
-        "eslint-config-airbnb-base": "^13.1.0",
-        "eslint-config-prettier": "^3.0.1",
-        "eslint-plugin-import": "^2.14.0",
+        "ansi-colors": "^4.1.1",
+        "aws-sdk": "^2.614.0",
+        "@babel/core": "^7.8.4",
+        "@babel/preset-env": "^7.8.4",
+        "babel-eslint": "^10.0.3",
+        "browser-sync": "^2.26.7",
+        "del": "^5.1.0",
+        "eslint": "^6.8.0",
+        "eslint-config-airbnb-base": "^14.0.0",
+        "eslint-config-prettier": "^6.10.0",
+        "eslint-plugin-import": "^2.20.1",
+        "eslint-plugin-simple-import-sort": "^5.0.1",
+        "fancy-log": "^1.3.3",
         "fastly-purge": "^1.0.1",
         "git-branch": "^2.0.1",
-        "gulp": "^3.9.1",
-        "gulp-autoprefixer": "^5.0.0",
-        "gulp-better-rollup": "^3.3.0",
-        "gulp-clean-css": "^3.10.0",
-        "gulp-concat": "^2.6.1",
-        "gulp-filter": "^5.1.0",
-        "gulp-header": "^2.0.5",
+        "gulp": "^4.0.2",
+        "gulp-autoprefixer": "^7.0.1",
+        "gulp-awspublish": "^4.1.1",
+        "gulp-better-rollup": "^4.0.1",
+        "gulp-clean-css": "^4.2.0",
+        "gulp-filter": "^6.0.0",
+        "gulp-header": "^2.0.9",
+        "gulp-imagemin": "^7.1.0",
         "gulp-open": "^3.0.1",
+        "gulp-plumber": "^1.2.1",
         "gulp-postcss": "^8.0.0",
-        "gulp-rename": "^1.4.0",
+        "gulp-rename": "^2.0.0",
         "gulp-replace": "^1.0.0",
-        "gulp-s3": "^0.11.0",
-        "gulp-sass": "^4.0.1",
+        "gulp-sass": "^4.0.2",
         "gulp-size": "^3.0.0",
-        "gulp-sourcemaps": "^2.6.4",
-        "gulp-svgmin": "^1.2.4",
-        "gulp-svgstore": "^6.1.1",
-        "gulp-uglify-es": "^1.0.4",
-        "gulp-util": "^3.0.8",
-        "postcss-custom-properties": "^7.0.0",
-        "prettier-eslint": "^8.8.2",
+        "gulp-sourcemaps": "^2.6.5",
+        "gulp-svgstore": "^7.0.1",
+        "gulp-terser": "^1.2.0",
+        "postcss-custom-properties": "^9.0.2",
+        "prettier-eslint": "^9.0.1",
         "prettier-stylelint": "^0.4.2",
-        "remark-cli": "^5.0.0",
-        "remark-validate-links": "^7.1.0",
-        "rollup-plugin-babel": "^3.0.7",
-        "rollup-plugin-commonjs": "^9.1.5",
-        "rollup-plugin-node-resolve": "^3.3.0",
-        "run-sequence": "^2.2.1",
-        "stylelint": "^9.4.0",
-        "stylelint-config-prettier": "^4.0.0",
-        "stylelint-config-recommended": "^2.1.0",
-        "stylelint-config-sass-guidelines": "^5.0.0",
-        "stylelint-order": "^1.0.0",
-        "stylelint-scss": "^3.3.0",
-        "stylelint-selector-bem-pattern": "^2.0.0",
-        "through2": "^2.0.3"
+        "remark-cli": "^7.0.1",
+        "remark-validate-links": "^9.2.0",
+        "rollup": "^1.31.0",
+        "rollup-plugin-babel": "^4.3.3",
+        "rollup-plugin-commonjs": "^10.1.0",
+        "rollup-plugin-node-resolve": "^5.2.0",
+        "stylelint": "^13.1.0",
+        "stylelint-config-prettier": "^8.0.1",
+        "stylelint-config-recommended": "^3.0.0",
+        "stylelint-config-sass-guidelines": "^7.0.0",
+        "stylelint-order": "^4.0.0",
+        "stylelint-scss": "^3.14.2",
+        "stylelint-selector-bem-pattern": "^2.1.0",
+        "through2": "^3.0.1"
     },
     "dependencies": {
-        "babel-polyfill": "^6.26.0",
-        "custom-event-polyfill": "^1.0.6",
-        "loadjs": "^3.5.4",
-        "raven-js": "^3.26.4",
-        "url-polyfill": "^1.0.14"
+        "core-js": "^3.6.4",
+        "custom-event-polyfill": "^1.0.7",
+        "loadjs": "^4.2.0",
+        "rangetouch": "^2.0.0",
+        "url-polyfill": "^1.1.8"
     }
 }

plyr.code-workspace

@@ -1,32 +1,37 @@
 {
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"settings": {
-		// Exclude from the editor
-		"files.exclude": {
-			"**/node_modules": true
-		},
-		// Exclude from search
-		"search.exclude": {
-			"dist/": true,
-			"demo/dist/": true
-		},
-		// Linting
-		"stylelint.enable": true,
-		"css.validate": false,
-		"scss.validate": false,
-		"javascript.validate.enable": false,
-		// Prettier
-		"prettier.eslintIntegration": true,
-		"prettier.stylelintIntegration": true,
-		// Formatting
-		"editor.tabSize": 4,
-		"editor.insertSpaces": true,
-		"editor.formatOnSave": true,
-		// Trim on save
-		"files.trimTrailingWhitespace": true
-	}
-}
+    "folders": [
+        {
+            "path": "."
+        }
+    ],
+    "settings": {
+        "search.exclude": {
+            "**/node_modules": true,
+            "**/dist": true
+        },
+
+        // Linting
+        "stylelint.enable": true,
+        "css.validate": false,
+        "scss.validate": false,
+        "javascript.validate.enable": false,
+
+        // Formatting
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.tabSize": 4,
+        "editor.insertSpaces": true,
+        "editor.formatOnSave": true,
+
+        // Trim on save
+        "files.trimTrailingWhitespace": true,
+
+        // Special file associations
+        "files.associations": {
+            ".eslintrc": "jsonc"
+        },
+
+        "editor.codeActionsOnSave": {
+            "source.fixAll": true
+        }
+    }
+}

readme.md

@@ -1,94 +1,77 @@
-# Plyr
+Plyr is a simple, lightweight, accessible and customizable HTML5, YouTube and Vimeo media player that supports [_modern_](#browser-support) browsers.
 
-A simple, lightweight, accessible and customizable HTML5, YouTube and Vimeo media player that supports [_modern_](#browser-support) browsers.
-
-[Checkout the demo](https://plyr.io) - [Donate to support Plyr](#donate) - [Chat on Slack](https://bit.ly/plyr-chat)
+[Checkout the demo](https://plyr.io) - [Donate](#donate) - [Slack](https://bit.ly/plyr--chat) - [![npm version](https://badge.fury.io/js/plyr.svg)](https://badge.fury.io/js/plyr)
 
 [![Image of Plyr](https://cdn.plyr.io/static/demo/screenshot.png?v=3)](https://plyr.io)
 
-## Features
+# Features
 
--   **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
+-   📼 **HTML Video & Audio, YouTube & Vimeo** - support for the major formats
+-   💪 **Accessible** - full support for VTT captions and screen readers
+-   🔧 **[Customizable](#html)** - make the player look how you want with the markup you want
+-   😎 **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](#try-plyr-online)** - support for hls.js, Shaka and dash.js streaming playback
--   **[API](#api)** - toggle playback, volume, seeking, and more through a standardized API
--   **[Events](#events)** - no messing around with Vimeo and YouTube APIs, all events are standardized across formats
--   **[Fullscreen](#fullscreen)** - supports native fullscreen with fallback to "full window" modes
--   **[Shortcuts](#shortcuts)** - supports keyboard shortcuts
--   **Picture-in-Picture** - supports Safari's picture-in-picture mode
--   **Playsinline** - supports the `playsinline` attribute
--   **Speed controls** - adjust speed on the fly
--   **Multiple captions** - support for multiple caption tracks
--   **i18n support** - support for internationalization of controls
--   **No dependencies** - written in "vanilla" ES6 JavaScript, no jQuery required
--   **SASS** - to include in your build processes
+-   📱 **Responsive** - works with any screen size
+-   💵 **[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
+-   🎤 **[Events](#events)** - no messing around with Vimeo and YouTube APIs, all events are standardized across formats
+-   🔎 **[Fullscreen](#fullscreen)** - supports native fullscreen with fallback to "full window" modes
+-   ⌨️ **[Shortcuts](#shortcuts)** - supports keyboard shortcuts
+-   🖥 **Picture-in-Picture** - supports picture-in-picture mode
+-   📱 **Playsinline** - supports the `playsinline` attribute
+-   🏎 **Speed controls** - adjust speed on the fly
+-   📖 **Multiple captions** - support for multiple caption tracks
+-   🌎 **i18n support** - support for internationalization of controls
+-   👌 **[Preview thumbnails](#preview-thumbnails)** - support for displaying preview thumbnails
+-   🤟 **No frameworks** - written in "vanilla" ES6 JavaScript, no jQuery required
+-   💁‍♀️ **SASS** - to include in your build processes
 
-Oh and yes, it works with Bootstrap.
-
-## Changelog
-
-Check out the [changelog](changelog.md) to see what's new with Plyr.
-
-## Plugins & Components
-
-Some awesome folks have made plugins for CMSs and Components for JavaScript frameworks:
-
-| Type      | Maintainer                                                     | Link                                                                                         |
-| --------- | -------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
-| WordPress | Brandon Lavigne ([@drrobotnik](https://github.com/drrobotnik)) | [https://wordpress.org/plugins/plyr/](https://wordpress.org/plugins/plyr/)                   |
-| React     | Jose Miguel Bejarano ([@xDae](https://github.com/xDae))        | [https://github.com/xDae/react-plyr](https://github.com/xDae/react-plyr)                     |
-| Vue       | Gabe Dunn ([@redxtech](https://github.com/redxtech))           | [https://github.com/redxtech/vue-plyr](https://github.com/redxtech/vue-plyr)                 |
-| Neos      | Jon Uhlmann ([@jonnitto](https://github.com/jonnitto))         | [https://packagist.org/packages/jonnitto/plyr](https://packagist.org/packages/jonnitto/plyr) |
-| Kirby     | Dominik Pschenitschni ([@dpschen](https://github.com/dpschen)) | [https://github.com/dpschen/kirby-plyrtag](https://github.com/dpschen/kirby-plyrtag)         |
-
-## Quick setup
-
-Here's a quick run through on getting up and running. There's also a [demo on Codepen](http://codepen.io/sampotts/pen/jARJYp). You can grab all of the source with [NPM](https://www.npmjs.com/package/plyr) using `npm install plyr`.
-
-### Try Plyr online
+### Demos
 
 You can try Plyr in Codepen using our minimal templates: [HTML5 video](https://codepen.io/pen?template=bKeqpr), [HTML5 audio](https://codepen.io/pen?template=rKLywR), [YouTube](https://codepen.io/pen?template=GGqbbJ), [Vimeo](https://codepen.io/pen?template=bKeXNq). For Streaming we also have example integrations with: [Dash.js](https://codepen.io/pen?template=zaBgBy), [Hls.js](https://codepen.io/pen?template=oyLKQb) and [Shaka Player](https://codepen.io/pen?template=ZRpzZO)
 
-### HTML
+# Quick setup
+
+## HTML
 
 Plyr extends upon the standard [HTML5 media element](https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement) markup so that's all you need for those types.
 
-#### HTML5 Video
+### HTML5 Video
 
 ```html
 <video poster="/path/to/poster.jpg" id="player" playsinline controls>
-    <source src="/path/to/video.mp4" type="video/mp4">
-    <source src="/path/to/video.webm" type="video/webm">
+    <source src="/path/to/video.mp4" type="video/mp4" />
+    <source src="/path/to/video.webm" type="video/webm" />
 
     <!-- Captions are optional -->
-    <track kind="captions" label="English captions" src="/path/to/captions.vtt" srclang="en" default>
+    <track kind="captions" label="English captions" src="/path/to/captions.vtt" srclang="en" default />
 </video>
 ```
 
-#### HTML5 Audio
+### HTML5 Audio
 
 ```html
 <audio id="player" controls>
-    <source src="/path/to/audio.mp3" type="audio/mp3">
-    <source src="/path/to/audio.ogg" type="audio/ogg">
+    <source src="/path/to/audio.mp3" type="audio/mp3" />
+    <source src="/path/to/audio.ogg" type="audio/ogg" />
 </audio>
 ```
 
 For YouTube and Vimeo players, Plyr uses progressive enhancement to enhance the default `<iframe>` embeds. Below are some examples. The `plyr__video-embed` classname will make the embed responsive. You can add the `autoplay`, `loop`, `hl` (YouTube only) and `playsinline` (YouTube only) query parameters to the URL and they will be set as config options automatically. For YouTube, the `origin` should be updated to reflect the domain you're hosting the embed on, or you can opt to omit it.
 
-#### YouTube embed
+### YouTube
 
 We recommend [progressive enhancement](https://www.smashingmagazine.com/2009/04/progressive-enhancement-what-it-is-and-how-to-use-it/) with the embedded players. You can elect to use an `<iframe>` as the source element (which Plyr will progressively enhance) or a bog standard `<div>` with two essential data attributes - `data-plyr-provider` and `data-plyr-embed-id`.
 
 ```html
 <div class="plyr__video-embed" id="player">
-    <iframe src="https://www.youtube.com/embed/bTqVqk7FSmY?origin=https://plyr.io&amp;iv_load_policy=3&amp;modestbranding=1&amp;playsinline=1&amp;showinfo=0&amp;rel=0&amp;enablejsapi=1" allowfullscreen allowtransparency allow="autoplay"></iframe>
+    <iframe
+        src="https://www.youtube.com/embed/bTqVqk7FSmY?origin=https://plyr.io&amp;iv_load_policy=3&amp;modestbranding=1&amp;playsinline=1&amp;showinfo=0&amp;rel=0&amp;enablejsapi=1"
+        allowfullscreen
+        allowtransparency
+        allow="autoplay"
+    ></iframe>
 </div>
 ```
 
@@ -102,13 +85,18 @@ Or the `<div>` non progressively enhanced method:
 
 _Note_: The `data-plyr-embed-id` can either be the video ID or URL for the media.
 
-#### Vimeo embed
+### Vimeo
 
 Much the same as YouTube above.
 
 ```html
 <div class="plyr__video-embed" id="player">
-    <iframe src="https://player.vimeo.com/video/76979871?loop=false&amp;byline=false&amp;portrait=false&amp;title=false&amp;speed=true&amp;transparent=0&amp;gesture=media" allowfullscreen allowtransparency allow="autoplay"></iframe>
+    <iframe
+        src="https://player.vimeo.com/video/76979871?loop=false&amp;byline=false&amp;portrait=false&amp;title=false&amp;speed=true&amp;transparent=0&amp;gesture=media"
+        allowfullscreen
+        allowtransparency
+        allow="autoplay"
+    ></iframe>
 </div>
 ```
 
@@ -118,13 +106,23 @@ Or the `<div>` non progressively enhanced method:
 <div id="player" data-plyr-provider="vimeo" data-plyr-embed-id="76979871"></div>
 ```
 
-### JavaScript
+## 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');
+```
+
+Alternatively 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>
-<script>const player = new Plyr('#player');</script>
+<script>
+    const player = new Plyr('#player');
+</script>
 ```
 
 See [initialising](#initialising) for more information on advanced setups.
@@ -132,35 +130,35 @@ 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.4.2/plyr.js"></script>
+<script src="https://cdn.plyr.io/3.5.9/plyr.js"></script>
 ```
 
 ...or...
 
 ```html
-<script src="https://cdn.plyr.io/3.4.2/plyr.polyfilled.js"></script>
+<script src="https://cdn.plyr.io/3.5.9/plyr.polyfilled.js"></script>
 ```
 
-### CSS
+## 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">
+<link rel="stylesheet" href="path/to/plyr.css" />
 ```
 
 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.4.2/plyr.css">
+<link rel="stylesheet" href="https://cdn.plyr.io/3.5.9/plyr.css" />
 ```
 
-### SVG Sprite
+## 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.4.2/plyr.svg`.
+reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.5.9/plyr.svg`.
 
-## Ads
+# Ads
 
 Plyr has partnered up with [vi.ai](https://vi.ai/publisher-video-monetization/?aid=plyrio) to offer monetization options for your videos. Getting setup is easy:
 
@@ -170,22 +168,22 @@ Plyr has partnered up with [vi.ai](https://vi.ai/publisher-video-monetization/?a
 
 Any questions regarding the ads can be sent straight to vi.ai and any issues with rendering raised through GitHub issues.
 
-## Advanced
+# Advanced
 
-### SASS
+## SASS
 
 You can use `bundle.scss` file included in `/src` as part of your build and change variables to suit your design. The SASS require you to
-use the [autoprefixer](https://www.npmjs.com/package/gulp-autoprefixer) plugin (you be should already!) as all declarations use the W3C definitions.
+use the [autoprefixer](https://www.npmjs.com/package/gulp-autoprefixer) plugin (you should be already!) as all declarations use the W3C definitions.
 
 The HTML markup uses the BEM methodology with `plyr` as the block, e.g. `.plyr__controls`. You can change the class hooks in the options to match any custom CSS
 you write. Check out the JavaScript source for more on this.
 
-### SVG
+## SVG
 
 The icons used in the Plyr controls are loaded in an SVG sprite. The sprite is automatically loaded from our CDN by default. If you already have an icon build
 system in place, you can include the source plyr icons (see `/src/sprite` for source icons).
 
-#### Using the `iconUrl` option
+### Using the `iconUrl` option
 
 You can however specify your own `iconUrl` option and Plyr will determine if the url is absolute and requires loading by AJAX/CORS due to current browser
 limitations or if it's a relative path, just use the path directly.
@@ -195,34 +193,33 @@ If you're using the `<base>` tag on your site, you may need to use something lik
 More info on SVG sprites here: [http://css-tricks.com/svg-sprites-use-better-icon-fonts/](http://css-tricks.com/svg-sprites-use-better-icon-fonts/) and the AJAX
 technique here: [http://css-tricks.com/ajaxing-svg-sprite/](http://css-tricks.com/ajaxing-svg-sprite/)
 
-### Cross Origin (CORS)
+## Cross Origin (CORS)
 
 You'll notice the `crossorigin` attribute on the example `<video>` elements. This is because the TextTrack captions are loaded from another domain. If your
 TextTrack captions are also hosted on another domain, you will need to add this attribute and make sure your host has the correct headers setup. For more info
 on CORS checkout the MDN docs:
 [https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS)
 
-### Captions
+## Captions
 
 WebVTT captions are supported. To add a caption track, check the HTML example above and look for the `<track>` element. Be sure to
 [validate your caption files](https://quuz.org/webvtt/).
 
-### JavaScript
+## JavaScript
 
-#### Initialising
+### Initialising
 
 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 [`NodeList`](https://developer.mozilla.org/en-US/docs/Web/API/NodeList)
 -   A [jQuery](https://jquery.com) object
 
-_Note_: If a `NodeList`, `Array`, or jQuery object are passed, the first element will be used for setup. To setup multiple players, see [setting up multiple players](#setting-up-multiple-players) below.
+_Note_: If a `NodeList`, `Array`, or jQuery object are passed, the first element will be used for setup. To setup multiple players, see [multiple players](#multiple-players) below.
 
-Here's some examples
+#### 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');
@@ -234,15 +231,13 @@ Passing a [HTMLElement](https://developer.mozilla.org/en/docs/Web/API/HTMLElemen
 const player = new Plyr(document.getElementById('player'));
 ```
 
-Passing a [NodeList](https://developer.mozilla.org/en-US/docs/Web/API/NodeList) (see note below):
-
 ```javascript
-const player = new Plyr(document.querySelectorAll('.js-player'));
+const player = new Plyr(document.querySelector('.js-player'));
 ```
 
-The NodeList, HTMLElement or string selector can be the target `<video>`, `<audio>`, or `<div>` wrapper for embeds.
+The HTMLElement or string selector can be the target `<video>`, `<audio>`, or `<div>` wrapper for embeds.
 
-##### Setting up multiple players
+#### Multiple players
 
 You have two choices here. You can either use a simple array loop to map the constructor:
 
@@ -250,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) or an [Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) of elements:
+...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');
@@ -258,71 +253,76 @@ const players = Plyr.setup('.js-player');
 
 Both options will also return an array of instances in the order of they were in the DOM for the string selector or the source NodeList or Array.
 
-##### Passing options
+#### Options
 
 The second argument for the constructor is the [options](#options) object:
 
 ```javascript
 const player = new Plyr('#player', {
-    /* options */
+    title: 'Example Title',
 });
 ```
 
-In all cases, the constructor will return a Plyr object that can be used with the [API](#api) methods. See the [API](#api) section for more info.
-
-#### Options
-
 Options can be passed as an object to the constructor as above or as JSON in `data-plyr-config` attribute on each of your target elements:
 
 ```html
-<video src="/path/to/video.mp4" id="player" controls data-plyr-config='{ "title": "This is an example video", "volume": 1, "debug": true }'></video>
+<video src="/path/to/video.mp4" id="player" controls data-plyr-config='{ "title": "Example Title" }'></video>
 ```
 
 Note the single quotes encapsulating the JSON and double quotes on the object keys. Only string values need double quotes.
 
-| Option               | Type                       | Default                                                                                                                        | Description                                                                                                                                                                                                                                                                                                                                                            |
-| -------------------- | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `enabled`            | Boolean                    | `true`                                                                                                                         | Completely disable Plyr. This would allow you to do a User Agent check or similar to programmatically enable or disable Plyr for a certain UA. Example below.                                                                                                                                                                                                          |
-| `debug`              | Boolean                    | `false`                                                                                                                        | Display debugging information in the console                                                                                                                                                                                                                                                                                                                           |
-| `controls`           | Array, Function or Element | `['play-large', 'play', 'progress', 'current-time', 'mute', 'volume', 'captions', 'settings', 'pip', 'airplay', 'fullscreen']` | If a function is passed, it is assumed your method will return either an element or HTML string for the controls. Three arguments will be passed to your function; `id` (the unique id for the player), `seektime` (the seektime step in seconds), and `title` (the media title). See [controls.md](controls.md) for more info on how the html needs to be structured. |
-| `settings`           | Array                      | `['captions', 'quality', 'speed', 'loop']`                                                                                     | If you're using the default controls are used then you can specify which settings to show in the menu                                                                                                                                                                                                                                                                  |
-| `i18n`               | Object                     | See [defaults.js](/src/js/config/defaults.js)                                                                                  | Used for internationalization (i18n) of the text within the UI.                                                                                                                                                                                                                                                                                                        |
-| `loadSprite`         | Boolean                    | `true`                                                                                                                         | Load the SVG sprite specified as the `iconUrl` option (if a URL). If `false`, it is assumed you are handling sprite loading yourself.                                                                                                                                                                                                                                  |
-| `iconUrl`            | String                     | `null`                                                                                                                         | Specify a URL or path to the SVG sprite. See the [SVG section](#svg) for more info.                                                                                                                                                                                                                                                                                    |
-| `iconPrefix`         | String                     | `plyr`                                                                                                                         | Specify the id prefix for the icons used in the default controls (e.g. "plyr-play" would be "plyr"). This is to prevent clashes if you're using your own SVG sprite but with the default controls. Most people can ignore this option.                                                                                                                                 |
-| `blankVideo`         | String                     | `https://cdn.plyr.io/static/blank.mp4`                                                                                         | Specify a URL or path to a blank video file used to properly cancel network requests.                                                                                                                                                                                                                                                                                  |
-| `autoplay`           | Boolean                    | `false`                                                                                                                        | Autoplay the media on load. This is generally advised against on UX grounds. It is also disabled by default in some browsers. If the `autoplay` attribute is present on a `<video>` or `<audio>` element, this will be automatically set to true.                                                                                                                      |
-| `autopause`&sup1;    | Boolean                    | `true`                                                                                                                         | Only allow one player playing at once.                                                                                                                                                                                                                                                                                                                                 |
-| `seekTime`           | Number                     | `10`                                                                                                                           | The time, in seconds, to seek when a user hits fast forward or rewind.                                                                                                                                                                                                                                                                                                 |
-| `volume`             | Number                     | `1`                                                                                                                            | A number, between 0 and 1, representing the initial volume of the player.                                                                                                                                                                                                                                                                                              |
-| `muted`              | Boolean                    | `false`                                                                                                                        | Whether to start playback muted. If the `muted` attribute is present on a `<video>` or `<audio>` element, this will be automatically set to true.                                                                                                                                                                                                                      |
-| `clickToPlay`        | Boolean                    | `true`                                                                                                                         | Click (or tap) of the video container will toggle play/pause.                                                                                                                                                                                                                                                                                                          |
-| `disableContextMenu` | Boolean                    | `true`                                                                                                                         | Disable right click menu on video to <em>help</em> as very primitive obfuscation to prevent downloads of content.                                                                                                                                                                                                                                                      |
-| `hideControls`       | Boolean                    | `true`                                                                                                                         | Hide video controls automatically after 2s of no mouse or focus movement, on control element blur (tab out), on playback start or entering fullscreen. As soon as the mouse is moved, a control element is focused or playback is paused, the controls reappear instantly.                                                                                             |
-| `resetOnEnd`         | Boolean                    | false                                                                                                                          | Reset the playback to the start once playback is complete.                                                                                                                                                                                                                                                                                                             |
-| `keyboard`           | Object                     | `{ focused: true, global: false }`                                                                                             | Enable [keyboard shortcuts](#shortcuts) for focused players only or globally                                                                                                                                                                                                                                                                                           |
-| `tooltips`           | Object                     | `{ controls: false, seek: true }`                                                                                              | `controls`: Display control labels as tooltips on `:hover` & `:focus` (by default, the labels are screen reader only). `seek`: Display a seek tooltip to indicate on click where the media would seek to.                                                                                                                                                              |
-| `duration`           | Number                     | `null`                                                                                                                         | Specify a custom duration for media.                                                                                                                                                                                                                                                                                                                                   |
-| `displayDuration`    | Boolean                    | `true`                                                                                                                         | Displays the duration of the media on the "metadataloaded" event (on startup) in the current time display. This will only work if the `preload` attribute is not set to `none` (or is not set at all) and you choose not to display the duration (see `controls` option).                                                                                              |
-| `invertTime`         | Boolean                    | `true`                                                                                                                         | Display the current time as a countdown rather than an incremental counter.                                                                                                                                                                                                                                                                                            |
-| `toggleInvert`       | Boolean                    | `true`                                                                                                                         | Allow users to click to toggle the above.                                                                                                                                                                                                                                                                                                                              |
-| `listeners`          | Object                     | `null`                                                                                                                         | Allows binding of event listeners to the controls before the default handlers. See the `defaults.js` for available listeners. If your handler prevents default on the event (`event.preventDefault()`), the default handler will not fire.                                                                                                                             |
-| `captions`           | Object                     | `{ active: false, language: 'auto', update: false }`                                                                           | `active`: Toggles if captions should be active by default. `language`: Sets the default language to load (if available). 'auto' uses the browser language. `update`: Listen to changes to tracks and update menu. This is needed for some streaming libraries, but can result in unselectable language options).                                                       |
-| `fullscreen`         | Object                     | `{ enabled: true, fallback: true, iosNative: false }`                                                                          | `enabled`: Toggles whether fullscreen should be enabled. `fallback`: Allow fallback to a full-window solution. `iosNative`: whether to use native iOS fullscreen when entering fullscreen (no custom controls)                                                                                                                                                         |
-| `ratio`              | String                     | `16:9`                                                                                                                         | The aspect ratio you want to use for embedded players.                                                                                                                                                                                                                                                                                                                 |
-| `storage`            | Object                     | `{ enabled: true, key: 'plyr' }`                                                                                               | `enabled`: Allow use of local storage to store user settings. `key`: The key name to use.                                                                                                                                                                                                                                                                              |
-| `speed`              | Object                     | `{ selected: 1, options: [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2] }`                                                                 | `selected`: The default speed for playback. `options`: Options to display in the menu. Most browsers will refuse to play slower than 0.5.                                                                                                                                                                                                                              |
-| `quality`            | Object                     | `{ default: 'default', options: ['hd2160', 'hd1440', 'hd1080', 'hd720', 'large', 'medium', 'small', 'tiny', 'default'] }`      | Currently only supported by YouTube. `default` is the default quality level, determined by YouTube. `options` are the options to display.                                                                                                                                                                                                                              |
-| `loop`               | Object                     | `{ active: false }`                                                                                                            | `active`: Whether to loop the current video. If the `loop` attribute is present on a `<video>` or `<audio>` element, this will be automatically set to true This is an object to support future functionality.                                                                                                                                                         |
-| `ads`                | Object                     | `{ enabled: false, publisherId: '' }`                                                                                          | `enabled`: Whether to enable vi.ai ads. `publisherId`: Your unique vi.ai publisher ID.                                                                                                                                                                                                                                                                                 |
+| Option               | Type                       | Default                                                                                                                        | Description                                                                                                                                                                                                                                                                                                                                                                                             |
+| -------------------- | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `enabled`            | Boolean                    | `true`                                                                                                                         | Completely disable Plyr. This would allow you to do a User Agent check or similar to programmatically enable or disable Plyr for a certain UA. Example below.                                                                                                                                                                                                                                           |
+| `debug`              | Boolean                    | `false`                                                                                                                        | Display debugging information in the console                                                                                                                                                                                                                                                                                                                                                            |
+| `controls`           | Array, Function or Element | `['play-large', 'play', 'progress', 'current-time', 'mute', 'volume', 'captions', 'settings', 'pip', 'airplay', 'fullscreen']` | If a function is passed, it is assumed your method will return either an element or HTML string for the controls. Three arguments will be passed to your function; `id` (the unique id for the player), `seektime` (the seektime step in seconds), and `title` (the media title). See [controls.md](controls.md) for more info on how the html needs to be structured.                                  |
+| `settings`           | Array                      | `['captions', 'quality', 'speed', 'loop']`                                                                                     | If the default controls are used, you can specify which settings to show in the menu                                                                                                                                                                                                                                                                                                                    |
+| `i18n`               | Object                     | See [defaults.js](/src/js/config/defaults.js)                                                                                  | Used for internationalization (i18n) of the text within the UI.                                                                                                                                                                                                                                                                                                                                         |
+| `loadSprite`         | Boolean                    | `true`                                                                                                                         | Load the SVG sprite specified as the `iconUrl` option (if a URL). If `false`, it is assumed you are handling sprite loading yourself.                                                                                                                                                                                                                                                                   |
+| `iconUrl`            | String                     | `null`                                                                                                                         | Specify a URL or path to the SVG sprite. See the [SVG section](#svg) for more info.                                                                                                                                                                                                                                                                                                                     |
+| `iconPrefix`         | String                     | `plyr`                                                                                                                         | Specify the id prefix for the icons used in the default controls (e.g. "plyr-play" would be "plyr"). This is to prevent clashes if you're using your own SVG sprite but with the default controls. Most people can ignore this option.                                                                                                                                                                  |
+| `blankVideo`         | String                     | `https://cdn.plyr.io/static/blank.mp4`                                                                                         | Specify a URL or path to a blank video file used to properly cancel network requests.                                                                                                                                                                                                                                                                                                                   |
+| `autoplay`&sup2;     | Boolean                    | `false`                                                                                                                        | Autoplay the media on load. If the `autoplay` attribute is present on a `<video>` or `<audio>` element, this will be automatically set to true.                                                                                                                                                                                                                                                         |
+| `autopause`&sup1;    | Boolean                    | `true`                                                                                                                         | Only allow one player playing at once.                                                                                                                                                                                                                                                                                                                                                                  |
+| `seekTime`           | Number                     | `10`                                                                                                                           | The time, in seconds, to seek when a user hits fast forward or rewind.                                                                                                                                                                                                                                                                                                                                  |
+| `volume`             | Number                     | `1`                                                                                                                            | A number, between 0 and 1, representing the initial volume of the player.                                                                                                                                                                                                                                                                                                                               |
+| `muted`              | Boolean                    | `false`                                                                                                                        | Whether to start playback muted. If the `muted` attribute is present on a `<video>` or `<audio>` element, this will be automatically set to true.                                                                                                                                                                                                                                                       |
+| `clickToPlay`        | Boolean                    | `true`                                                                                                                         | Click (or tap) of the video container will toggle play/pause.                                                                                                                                                                                                                                                                                                                                           |
+| `disableContextMenu` | Boolean                    | `true`                                                                                                                         | Disable right click menu on video to <em>help</em> as very primitive obfuscation to prevent downloads of content.                                                                                                                                                                                                                                                                                       |
+| `hideControls`       | Boolean                    | `true`                                                                                                                         | Hide video controls automatically after 2s of no mouse or focus movement, on control element blur (tab out), on playback start or entering fullscreen. As soon as the mouse is moved, a control element is focused or playback is paused, the controls reappear instantly.                                                                                                                              |
+| `resetOnEnd`         | Boolean                    | false                                                                                                                          | Reset the playback to the start once playback is complete.                                                                                                                                                                                                                                                                                                                                              |
+| `keyboard`           | Object                     | `{ focused: true, global: false }`                                                                                             | Enable [keyboard shortcuts](#shortcuts) for focused players only or globally                                                                                                                                                                                                                                                                                                                            |
+| `tooltips`           | Object                     | `{ controls: false, seek: true }`                                                                                              | `controls`: Display control labels as tooltips on `:hover` & `:focus` (by default, the labels are screen reader only). `seek`: Display a seek tooltip to indicate on click where the media would seek to.                                                                                                                                                                                               |
+| `duration`           | Number                     | `null`                                                                                                                         | Specify a custom duration for media.                                                                                                                                                                                                                                                                                                                                                                    |
+| `displayDuration`    | Boolean                    | `true`                                                                                                                         | Displays the duration of the media on the "metadataloaded" event (on startup) in the current time display. This will only work if the `preload` attribute is not set to `none` (or is not set at all) and you choose not to display the duration (see `controls` option).                                                                                                                               |
+| `invertTime`         | Boolean                    | `true`                                                                                                                         | Display the current time as a countdown rather than an incremental counter.                                                                                                                                                                                                                                                                                                                             |
+| `toggleInvert`       | Boolean                    | `true`                                                                                                                         | Allow users to click to toggle the above.                                                                                                                                                                                                                                                                                                                                                               |
+| `listeners`          | Object                     | `null`                                                                                                                         | Allows binding of event listeners to the controls before the default handlers. See the `defaults.js` for available listeners. If your handler prevents default on the event (`event.preventDefault()`), the default handler will not fire.                                                                                                                                                              |
+| `captions`           | Object                     | `{ active: false, language: 'auto', update: false }`                                                                           | `active`: Toggles if captions should be active by default. `language`: Sets the default language to load (if available). 'auto' uses the browser language. `update`: Listen to changes to tracks and update menu. This is needed for some streaming libraries, but can result in unselectable language options).                                                                                        |
+| `fullscreen`         | Object                     | `{ enabled: true, fallback: true, iosNative: false }`                                                                          | `enabled`: Toggles whether fullscreen should be enabled. `fallback`: Allow fallback to a full-window solution (`true`/`false`/`'force'`). `iosNative`: whether to use native iOS fullscreen when entering fullscreen (no custom controls)                                                                                                                                                               |
+| `ratio`              | String                     | `null`                                                                                                                         | Force an aspect ratio for all videos. The format is `'w:h'` - e.g. `'16:9'` or `'4:3'`. If this is not specified then the default for HTML5 and Vimeo is to use the native resolution of the video. As dimensions are not available from YouTube via SDK, 16:9 is forced as a sensible default.                                                                                                         |
+| `storage`            | Object                     | `{ enabled: true, key: 'plyr' }`                                                                                               | `enabled`: Allow use of local storage to store user settings. `key`: The key name to use.                                                                                                                                                                                                                                                                                                               |
+| `speed`              | Object                     | `{ selected: 1, options: [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2] }`                                                                 | `selected`: The default speed for playback. `options`: The speed options to display in the UI. YouTube and Vimeo will ignore any options outside of the 0.5-2 range, so options outside of this range will be hidden automatically.                                                                                                                                                                     |
+| `quality`            | Object                     | `{ default: 576, options: [4320, 2880, 2160, 1440, 1080, 720, 576, 480, 360, 240] }`                                           | `default` is the default quality level (if it exists in your sources). `options` are the options to display. This is used to filter the available sources.                                                                                                                                                                                                                                              |
+| `loop`               | Object                     | `{ active: false }`                                                                                                            | `active`: Whether to loop the current video. If the `loop` attribute is present on a `<video>` or `<audio>` element, this will be automatically set to true This is an object to support future functionality.                                                                                                                                                                                          |
+| `ads`                | Object                     | `{ enabled: false, publisherId: '' }`                                                                                          | `enabled`: Whether to enable advertisements. `publisherId`: Your unique [vi.ai](https://vi.ai/publisher-video-monetization/?aid=plyrio) publisher ID.                                                                                                                                                                                                                                                   |
+| `urls`               | Object                     | See source.                                                                                                                    | If you wish to override any API URLs then you can do so here. You can also set a custom download URL for the download button.                                                                                                                                                                                                                                                                           |
+| `vimeo`              | Object                     | `{ byline: false, portrait: false, title: false, speed: true, transparent: false }`                                            | See [Vimeo embed options](https://github.com/vimeo/player.js/#embed-options). Some are set automatically based on other config options, namely: `loop`, `autoplay`, `muted`, `gesture`, `playsinline`                                                                                                                                                                                                   |
+| `youtube`            | Object                     | `{ noCookie: false, rel: 0, showinfo: 0, iv_load_policy: 3, modestbranding: 1 }`                                               | See [YouTube embed options](https://developers.google.com/youtube/player_parameters#Parameters). The only custom option is `noCookie` to use an alternative to YouTube that doesn't use cookies (useful for GDPR, etc). Some are set automatically based on other config options, namely: `autoplay`, `hl`, `controls`, `disablekb`, `playsinline`, `cc_load_policy`, `cc_lang_pref`, `widget_referrer` |
+| `previewThumbnails`  | Object                     | `{ enabled: false, src: '' }`                                                                                                  | `enabled`: Whether to enable the preview thumbnails (they must be generated by you). `src` must be either a string or an array of strings representing URLs for the VTT files containing the image URL(s). Learn more about [preview thumbnails](#preview-thumbnails) below.                                                                                                                            |
 
 1.  Vimeo only
+2.  Autoplay is generally not recommended as it is seen as a negative user experience. It is also disabled in many browsers. Before raising issues, do your homework. More info can be found here:
 
-## API
+-   https://webkit.org/blog/6784/new-video-policies-for-ios/
+-   https://developers.google.com/web/updates/2017/09/autoplay-policy-changes
+-   https://hacks.mozilla.org/2019/02/firefox-66-to-block-automatically-playing-audible-video-and-audio/
+
+# API
 
 There are methods, setters and getters on a Plyr object.
 
-### Object
+## Object
 
 The easiest way to access the Plyr object is to set the return value from your call to the constructor to a variable. For example:
 
@@ -340,7 +340,7 @@ element.addEventListener('ready', event => {
 });
 ```
 
-### Methods
+## Methods
 
 Example method use:
 
@@ -374,7 +374,7 @@ player.fullscreen.enter(); // Enter fullscreen
 
 1.  For HTML5 players, `play()` will return a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) in _some_ browsers - WebKit and Mozilla [according to MDN](https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/play) at time of writing.
 
-### Getters and Setters
+## Getters and Setters
 
 Example setters:
 
@@ -416,12 +416,13 @@ player.fullscreen.active; // false;
 | `language`           | ✓      | ✓      | Gets or sets the preferred captions language for the player. The setter accepts an ISO two-letter language code. Support for the languages is dependent on the captions you include. If your captions don't have any language data, or if you have multiple tracks with the same language, you may want to use `currentTrack` instead. |
 | `fullscreen.active`  | ✓      | -      | Returns a boolean indicating if the current player is in fullscreen mode.                                                                                                                                                                                                                                                              |
 | `fullscreen.enabled` | ✓      | -      | Returns a boolean indicating if the current player has fullscreen enabled.                                                                                                                                                                                                                                                             |
-| `pip`                | ✓      | ✓      | Gets or sets the picture-in-picture state of the player. The setter accepts a boolean. This currently only supported on Safari 10+ on MacOS Sierra+ and iOS 10+.                                                                                                                                                                       |
+| `pip`&sup1;          | ✓      | ✓      | Gets or sets the picture-in-picture state of the player. The setter accepts a boolean. This currently only supported on Safari 10+ (on MacOS Sierra+ and iOS 10+) and Chrome 70+.                                                                                                                                                      |
+| `ratio`              | ✓      | ✓      | Gets or sets the video aspect ratio. The setter accepts a string in the same format as the `ratio` option.                                                                                                                                                                                                                             |
+| `download`           | ✓      | ✓      | Gets or sets the URL for the download button. The setter accepts a string containing a valid absolute URL.                                                                                                                                                                                                                             |
 
-1.  YouTube only. HTML5 will follow.
-2.  HTML5 only
+1.  HTML5 only
 
-#### The `.source` setter
+### The `.source` setter
 
 This allows changing the player source and type on the fly.
 
@@ -444,6 +445,9 @@ player.source = {
         },
     ],
     poster: '/path/to/poster.jpg',
+    previewThumbnails: {
+        src: '/path/to/thumbnails.vtt'
+    },
     tracks: [
         {
             kind: 'captions',
@@ -513,17 +517,18 @@ player.source = {
 
 _Note:_ `src` property for YouTube and Vimeo can either be the video ID or the whole URL.
 
-| Property       | Type   | Description                                                                                                                                                                                                                                                                                                                                                                                                    |
-| -------------- | ------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `type`         | String | Either `video` or `audio`. _Note:_ YouTube and Vimeo are currently not supported as audio sources.                                                                                                                                                                                                                                                                                                             |
-| `title`        | String | _Optional._ Title of the new media. Used for the `aria-label` attribute on the play button, and outer container. YouTube and Vimeo are populated automatically.                                                                                                                                                                                                                                                |
-| `sources`      | Array  | This is an array of sources. For HTML5 media, the properties of this object are mapped directly to HTML attributes so more can be added to the object if required.                                                                                                                                                                                                                                             |
-| `poster`&sup1; | String | The URL for the poster image (HTML5 video only).                                                                                                                                                                                                                                                                                                                                                               |
-| `tracks`&sup1; | String | An array of track objects. Each element in the array is mapped directly to a track element and any keys mapped directly to HTML attributes so as in the example above, it will render as `<track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/example_captions_en.vtt" default>` and similar for the French version. Booleans are converted to HTML5 value-less attributes. |
+| Property                  | Type   | Description                                                                                                                                                                                                                                                                                                                                                                                                    |
+| ------------------------- | ------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `type`                    | String | Either `video` or `audio`. _Note:_ YouTube and Vimeo are currently not supported as audio sources.                                                                                                                                                                                                                                                                                                             |
+| `title`                   | String | _Optional._ Title of the new media. Used for the `aria-label` attribute on the play button, and outer container. YouTube and Vimeo are populated automatically.                                                                                                                                                                                                                                                |
+| `sources`                 | Array  | This is an array of sources. For HTML5 media, the properties of this object are mapped directly to HTML attributes so more can be added to the object if required.                                                                                                                                                                                                                                             |
+| `poster`&sup1;            | String | The URL for the poster image (HTML5 video only).                                                                                                                                                                                                                                                                                                                                                               |
+| `tracks`&sup1;            | String | An array of track objects. Each element in the array is mapped directly to a track element and any keys mapped directly to HTML attributes so as in the example above, it will render as `<track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/example_captions_en.vtt" default>` and similar for the French version. Booleans are converted to HTML5 value-less attributes. |
+| `previewThumbnails`&sup1; | Object | The same object like in the `previewThumbnails` constructor option. This means you can either change the thumbnails vtt via the `src` key or disable the thumbnails plugin for the next video by passing `{ enabled: false }`.                                                                                                                                                                                 |
 
 1.  HTML5 only
 
-## Events
+# Events
 
 You can listen for events on the target element you setup Plyr on (see example under the table). Some events only apply to HTML5 audio and video. Using your
 reference to the instance, you can use the `on()` API method or `addEventListener()`. Access to the API can be obtained this way through the `event.detail.plyr`
@@ -535,7 +540,7 @@ player.on('ready', event => {
 });
 ```
 
-### Standard Media Events
+## Standard Media Events
 
 | Event Type         | Description                                                                                                                                                                                                            |
 | ------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -558,7 +563,7 @@ player.on('ready', event => {
 | `controlsshown`    | Sent when the controls are shown.                                                                                                                                                                                      |
 | `ready`            | Triggered when the instance is ready for API calls.                                                                                                                                                                    |
 
-#### HTML5 only
+### HTML5 only
 
 | Event Type       | Description                                                                                                                                                                                                                                                                                                                                    |
 | ---------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -574,7 +579,7 @@ player.on('ready', event => {
 | `cuechange`      | Sent when a `TextTrack` has changed the currently displaying cues.                                                                                                                                                                                                                                                                             |
 | `error`          | Sent when an error occurs. The element's `error` attribute contains more information.                                                                                                                                                                                                                                                          |
 
-#### YouTube only
+### YouTube only
 
 | Event Type    | Description                                                                                                                                                                                                                                                                                                                |
 | ------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -584,7 +589,7 @@ _Note:_ These events also bubble up the DOM. The event target will be the contai
 
 Some event details borrowed from [MDN](https://developer.mozilla.org/en-US/docs/Web/Guide/Events/Media_events).
 
-## Embeds
+# Embeds
 
 YouTube and Vimeo are currently supported and function much like a HTML5 video. Similar events and API methods are available for all types. However if you wish
 to access the API's directly. You can do so via the `embed` property of your player object - e.g. `player.embed`. You can then use the relevant methods from the
@@ -595,7 +600,7 @@ third party APIs. More info on the respective API's here:
 
 _Note_: Not all API methods may work 100%. Your mileage may vary. It's better to use the Plyr API where possible.
 
-## Shortcuts
+# Shortcuts
 
 By default, a player will bind the following keyboard shortcuts when it has focus. If you have the `global` option to `true` and there's only one player in the
 document then the shortcuts will work when any element has focus, apart from an element that requires input.
@@ -614,34 +619,40 @@ document then the shortcuts will work when any element has focus, apart from an
 | `C`        | Toggle captions                        |
 | `L`        | Toggle loop                            |
 
-## Fullscreen
+# Preview thumbnails
+
+It's possible to display preview thumbnails as per the demo when you hover over the scrubber or while you are scrubbing in the main video area. This can be used for all video types but is easiest with HTML5 of course. You will need to generate the sprite or images yourself. This is possible using something like AWS transcoder to generate the frames and then combine them into a sprite image. Sprites are recommended for performance reasons - they will be much faster to download and easier to compress into a small file size making them load faster.
+
+You can see the example VTT files [here](https://cdn.plyr.io/static/demo/thumbs/100p.vtt) and [here](https://cdn.plyr.io/static/demo/thumbs/240p.vtt) for how the sprites are done. The coordinates are set as the `xywh` hash on the URL in the order X Offset, Y Offset, Width, Height (e.g. `240p-00001.jpg#xywh=1708,480,427,240` is offset `1708px` from the left, `480px` from the top and is `427x240px`. If you want to include images per frame, this is also possible but will be slower, resulting in a degraded experience.
+
+# Fullscreen
 
 Fullscreen in Plyr is supported by all browsers that [currently support it](http://caniuse.com/#feat=fullscreen).
 
-## Browser support
+# Browser support
 
 Plyr supports the last 2 versions of most _modern_ browsers.
 
-| Browser       | Supported     |
-| ------------- | ------------- |
-| Safari        | ✓             |
-| Mobile Safari | ✓&sup1;       |
-| Firefox       | ✓             |
-| Chrome        | ✓             |
-| Opera         | ✓             |
-| Edge          | ✓             |
-| IE11          | ✓&sup3;       |
-| IE10          | ✓&sup2;&sup3; |
+| Browser       | Supported       |
+| ------------- | --------------- |
+| Safari        | ✓               |
+| Mobile Safari | ✓&sup1;         |
+| Firefox       | ✓               |
+| Chrome        | ✓               |
+| Opera         | ✓               |
+| Edge          | ✓               |
+| IE11          | ✓&sup3;         |
+| IE10          | ✓<sup>2,3</sup> |
 
 1.  Mobile Safari on the iPhone forces the native player for `<video>` unless the `playsinline` attribute is present. Volume controls are also disabled as they are handled device wide.
 2.  Native player used (no support for `<progress>` or `<input type="range">`) but the API is supported. No native fullscreen support, fallback can be used (see [options](#options)).
 3.  Polyfills required. See below.
 
-### Polyfills
+## Polyfills
 
 Plyr uses ES6 which isn't supported in all browsers quite yet. This means some features will need to be polyfilled to be available otherwise you'll run into issues. We've elected to not burden the ~90% of users that do support these features with extra JS and instead leave polyfilling to you to work out based on your needs. The easiest method I've found is to use [polyfill.io](https://polyfill.io) which provides polyfills based on user agent. This is the method the demo uses.
 
-### Checking for support
+## Checking for support
 
 You can use the static method to check for support. For example
 
@@ -655,7 +666,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:
 
@@ -667,42 +678,51 @@ The `enabled` option can be used to disable certain User Agents. For example, if
 
 If a User Agent is disabled but supports `<video>` and `<audio>` natively, it will use the native player.
 
-## RangeTouch
+# Plugins & Components
 
-Some touch browsers (particularly Mobile Safari on iOS) seem to have issues with `<input type="range">` elements whereby touching the track to set the value
-doesn't work and sliding the thumb can be tricky. To combat this, I've created [RangeTouch](https://rangetouch.com) which I'd recommend including in your
-solution. It's a tiny script with a nice benefit for users on touch devices.
+Some awesome folks have made plugins for CMSs and Components for JavaScript frameworks:
 
-## Issues
+| Type      | Maintainer                                                                | Link                                                                                         |
+| --------- | ------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
+| WordPress | Brandon Lavigne ([@drrobotnik](https://github.com/drrobotnik))            | [https://wordpress.org/plugins/plyr/](https://wordpress.org/plugins/plyr/)                   |
+| Angular   | Simon Bobrov ([@smnbbrv](https://github.com/smnbbrv))                     | [https://github.com/smnbbrv/ngx-plyr](https://github.com/smnbbrv/ngx-plyr)                   |
+| React     | Chintan Prajapati ([@chintan9](https://github.com/chintan9))              | [https://github.com/chintan9/plyr-react](https://github.com/chintan9/plyr-react)             |
+| Vue       | Gabe Dunn ([@redxtech](https://github.com/redxtech))                      | [https://github.com/redxtech/vue-plyr](https://github.com/redxtech/vue-plyr)                 |
+| Neos      | Jon Uhlmann ([@jonnitto](https://github.com/jonnitto))                    | [https://packagist.org/packages/jonnitto/plyr](https://packagist.org/packages/jonnitto/plyr) |
+| Kirby     | Dominik Pschenitschni ([@dpschen](https://github.com/dpschen))            | [https://github.com/dpschen/kirby-plyrtag](https://github.com/dpschen/kirby-plyrtag)         |
+| REDAXO    | FriendsOfRedaxo / skerbis ([@skerbis](https://friendsofredaxo.github.io)) | [https://github.com/FriendsOfREDAXO/plyr](https://github.com/FriendsOfREDAXO/plyr)           |
+
+# Issues
 
 If you find anything weird with Plyr, please let us know using the GitHub issues tracker.
 
-## Author
+# Author
 
 Plyr is developed by [@sam_potts](https://twitter.com/sam_potts) / [sampotts.me](http://sampotts.me) with help from the awesome
 [contributors](https://github.com/sampotts/plyr/graphs/contributors)
 
-## Donate
+# Donate
 
 Plyr costs money to run, not only my time. I donate my time for free as I enjoy building Plyr but unfortunately have to pay for domains, hosting, and more. Any help with costs is appreciated...
 
 -   [Donate via Patreon](https://www.patreon.com/plyr)
 -   [Donate via PayPal](https://www.paypal.me/pottsy/20usd)
 
-## Mentions
+# Mentions
 
 -   [ProductHunt](https://www.producthunt.com/tech/plyr)
 -   [The Changelog](http://thechangelog.com/plyr-simple-html5-media-player-custom-controls-webvtt-captions/)
 -   [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)
 -   [The Treehouse Show #131](https://teamtreehouse.com/library/episode-131-origami-react-responsive-hero-images)
 -   [noupe.com](http://www.noupe.com/design/html5-plyr-is-a-responsive-and-accessible-video-player-94389.html)
 
-## Used by
+# Used by
 
 -   [Selz.com](https://selz.com)
 -   [Peugeot.fr](http://www.peugeot.fr/marque-et-technologie/technologies/peugeot-i-cockpit.html)
@@ -713,17 +733,16 @@ Plyr costs money to run, not only my time. I donate my time for free as I enjoy
 -   [koel - A personal music streaming server that works.](http://koel.phanan.net/)
 -   [Oscar Radio](http://oscar-radio.xyz/)
 -   [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
+# Useful links and credits
 
-Credit to the PayPal HTML5 Video player from which Plyr's caption functionality was originally ported from:
-
--   [PayPal's Accessible HTML5 Video Player](https://github.com/paypal/accessible-html5-video-player)
+-   [PayPal's Accessible HTML5 Video Player (which Plyr was originally ported from)](https://github.com/paypal/accessible-html5-video-player)
 -   [An awesome guide for Plyr in Japanese!](http://syncer.jp/how-to-use-plyr-io) by [@arayutw](https://twitter.com/arayutw)
 
-## Thanks
+# Thanks
 
 [![Fastly](https://cdn.plyr.io/static/fastly-logo.png)](https://www.fastly.com/)
 
@@ -733,6 +752,6 @@ Massive thanks to [Fastly](https://www.fastly.com/) for providing the CDN servic
 
 Massive thanks to [Sentry](https://sentry.io/) for providing the logging services for the demo site.
 
-## Copyright and License
+# Copyright and License
 
 [The MIT license](license.md)

src/js/captions.js

@@ -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'
@@ -124,19 +123,22 @@ const captions = {
 
         // Handle tracks (add event listener and "pseudo"-default)
         if (this.isHTML5 && this.isVideo) {
-            tracks.filter(track => !meta.get(track)).forEach(track => {
-                this.debug.log('Track added', track);
-                // Attempt to store if the original dom element was "default"
-                meta.set(track, {
-                    default: track.mode === 'showing',
+            tracks
+                .filter(track => !meta.get(track))
+                .forEach(track => {
+                    this.debug.log('Track added', track);
+                    // Attempt to store if the original dom element was "default"
+                    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
+                    on.call(this, track, 'cuechange', () => captions.updateCues.call(this));
                 });
-
-                // Turn off native caption rendering to avoid double captions
-                track.mode = 'hidden';
-
-                // Add event listener for cue changes
-                on.call(this, track, 'cuechange', () => captions.updateCues.call(this));
-            });
         }
 
         // Update language first time it matches, or if the previous matching track was removed
@@ -164,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;
@@ -300,10 +301,12 @@ const captions = {
         const sortIsDefault = track => Number((this.captions.meta.get(track) || {}).default);
         const sorted = Array.from(tracks).sort((a, b) => sortIsDefault(b) - sortIsDefault(a));
         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
         });
+
         // If no match is found but is required, get first
         return track || (force ? sorted[0] : undefined);
     },
@@ -360,6 +363,7 @@ const captions = {
         // Get cues from track
         if (!cues) {
             const track = captions.getCurrentTrack.call(this);
+
             cues = Array.from((track || {}).activeCues || [])
                 .map(cue => cue.getCueAsHTML())
                 .map(getHTML);

src/js/config/defaults.js

@@ -42,8 +42,9 @@ const defaults = {
     // Clicking the currentTime inverts it's value to show time left rather than elapsed
     toggleInvert: true,
 
-    // Aspect ratio (for embeds)
-    ratio: '16:9',
+    // Force an aspect ratio
+    // The format must be `'w:h'` (e.g. `'16:9'`)
+    ratio: null,
 
     // Click video container to play/pause
     clickToPlay: true,
@@ -60,7 +61,7 @@ const defaults = {
     // Sprite (for icons)
     loadSprite: true,
     iconPrefix: 'plyr',
-    iconUrl: 'https://cdn.plyr.io/3.3.12/plyr.svg',
+    iconUrl: 'https://cdn.plyr.io/3.5.9/plyr.svg',
 
     // Blank video (used to prevent errors on source change)
     blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@@ -68,7 +69,10 @@ const defaults = {
     // Quality default
     quality: {
         default: 576,
+        // The options to display in the UI, if available for the source media
         options: [4320, 2880, 2160, 1440, 1080, 720, 576, 480, 360, 240],
+        forced: false,
+        onChange: null,
     },
 
     // Set loops
@@ -81,7 +85,8 @@ const defaults = {
     // Speed default and options to display
     speed: {
         selected: 1,
-        options: [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2],
+        // The options to display in the UI, if available for the source media (e.g. Vimeo and YouTube only support 0.5x-4x)
+        options: [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 4],
     },
 
     // Keyboard shortcut settings
@@ -108,7 +113,7 @@ const defaults = {
     // Fullscreen settings
     fullscreen: {
         enabled: true, // Allow fullscreen?
-        fallback: true, // Fallback for vintage browsers
+        fallback: true, // Fallback using full viewport/window
         iosNative: false, // Use the native fullscreen in iOS (disables custom controls)
     },
 
@@ -127,12 +132,14 @@ const defaults = {
         // 'fast-forward',
         'progress',
         'current-time',
+        // 'duration',
         'mute',
         'volume',
         'captions',
         'settings',
         'pip',
         'airplay',
+        // 'download',
         'fullscreen',
     ],
     settings: ['captions', 'quality', 'speed'],
@@ -155,11 +162,13 @@ const defaults = {
         unmute: 'Unmute',
         enableCaptions: 'Enable captions',
         disableCaptions: 'Disable captions',
+        download: 'Download',
         enterFullscreen: 'Enter fullscreen',
         exitFullscreen: 'Exit fullscreen',
         frameTitle: 'Player for {title}',
         captions: 'Captions',
         settings: 'Settings',
+        pip: 'PIP',
         menuBack: 'Go back to previous menu',
         speed: 'Speed',
         normal: 'Normal',
@@ -184,6 +193,7 @@ const defaults = {
 
     // URLs
     urls: {
+        download: null,
         vimeo: {
             sdk: 'https://player.vimeo.com/api/player.js',
             iframe: 'https://player.vimeo.com/video/{0}?{1}',
@@ -191,8 +201,7 @@ const defaults = {
         },
         youtube: {
             sdk: 'https://www.youtube.com/iframe_api',
-            api:
-                'https://www.googleapis.com/youtube/v3/videos?id={0}&key={1}&fields=items(snippet(title))&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',
@@ -210,6 +219,7 @@ const defaults = {
         mute: null,
         volume: null,
         captions: null,
+        download: null,
         fullscreen: null,
         pip: null,
         airplay: null,
@@ -245,6 +255,7 @@ const defaults = {
         'cuechange',
 
         // Custom events
+        'download',
         'enterfullscreen',
         'exitfullscreen',
         'captionsenabled',
@@ -290,6 +301,7 @@ const defaults = {
             fastForward: '[data-plyr="fast-forward"]',
             mute: '[data-plyr="mute"]',
             captions: '[data-plyr="captions"]',
+            download: '[data-plyr="download"]',
             fullscreen: '[data-plyr="fullscreen"]',
             pip: '[data-plyr="pip"]',
             airplay: '[data-plyr="airplay"]',
@@ -313,9 +325,6 @@ const defaults = {
         progress: '.plyr__progress',
         captions: '.plyr__captions',
         caption: '.plyr__caption',
-        menu: {
-            quality: '.js-plyr__menu__list--quality',
-        },
     },
 
     // Class hooks added to the player in different states
@@ -324,6 +333,7 @@ const defaults = {
         provider: 'plyr--{0}',
         video: 'plyr__video-wrapper',
         embed: 'plyr__video-embed',
+        videoFixedRatio: 'plyr__video-wrapper--fixed-ratio',
         embedContainer: 'plyr__video-embed__container',
         poster: 'plyr__poster',
         posterEnabled: 'plyr__poster-enabled',
@@ -368,6 +378,16 @@ const defaults = {
             active: 'plyr--airplay-active',
         },
         tabFocus: 'plyr__tab-focus',
+        previewThumbnails: {
+            // Tooltip thumbs
+            thumbContainer: 'plyr__preview-thumb',
+            thumbContainerShown: 'plyr__preview-thumb--is-shown',
+            imageContainer: 'plyr__preview-thumb__image-container',
+            timeContainer: 'plyr__preview-thumb__time-container',
+            // Scrubbing
+            scrubbingContainer: 'plyr__preview-scrubbing',
+            scrubbingContainerShown: 'plyr__preview-scrubbing--is-shown',
+        },
     },
 
     // Embed attributes
@@ -378,16 +398,41 @@ const defaults = {
         },
     },
 
-    // API keys
-    keys: {
-        google: null,
-    },
-
     // Advertisements plugin
     // Register for an account here: http://vi.ai/publisher-video-monetization/?aid=plyrio
     ads: {
         enabled: false,
         publisherId: '',
+        tagUrl: '',
+    },
+
+    // Preview Thumbnails plugin
+    previewThumbnails: {
+        enabled: false,
+        src: '',
+    },
+
+    // Vimeo plugin
+    vimeo: {
+        byline: false,
+        portrait: false,
+        title: false,
+        speed: true,
+        transparent: false,
+        // These settings require a pro or premium account to work
+        sidedock: false,
+        controls: false,
+        // Custom settings from Plyr
+        referrerPolicy: null, // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/referrerPolicy
+    },
+
+    // YouTube plugin
+    youtube: {
+        noCookie: false, // Whether to use an alternative version of YouTube without cookies
+        rel: 0, // No related vids
+        showinfo: 0, // Hide info
+        iv_load_policy: 3, // Hide annotations
+        modestbranding: 1, // Hide logos as much as possible (they still show one in the corner when paused)
     },
 };
 

src/js/config/states.js

@@ -0,0 +1,10 @@
+// ==========================================================================
+// Plyr states
+// ==========================================================================
+
+export const pip = {
+    active: 'picture-in-picture',
+    inactive: 'inline',
+};
+
+export default { pip };

src/js/config/types.js

@@ -15,11 +15,11 @@ export const types = {
 
 /**
  * Get provider by URL
- * @param {string} url
+ * @param {String} url
  */
 export function getProviderByUrl(url) {
     // YouTube
-    if (/^(https?:\/\/)?(www\.)?(youtube\.com|youtu\.?be)\/.+$/.test(url)) {
+    if (/^(https?:\/\/)?(www\.)?(youtube\.com|youtube-nocookie\.com|youtu\.?be)\/.+$/.test(url)) {
         return providers.youtube;
     }
 

src/js/fullscreen.js

@@ -1,54 +1,14 @@
 // ==========================================================================
 // Fullscreen wrapper
 // https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API#prefixing
+// https://webkit.org/blog/7929/designing-websites-for-iphone-x/
 // ==========================================================================
 
 import browser from './utils/browser';
-import { hasClass, toggleClass, trapFocus } from './utils/elements';
+import { getElements, hasClass, toggleClass } from './utils/elements';
 import { on, triggerEvent } from './utils/events';
 import is from './utils/is';
 
-function onChange() {
-    if (!this.enabled) {
-        return;
-    }
-
-    // Update toggle button
-    const button = this.player.elements.buttons.fullscreen;
-    if (is.element(button)) {
-        button.pressed = this.active;
-    }
-
-    // Trigger an event
-    triggerEvent.call(this.player, this.target, this.active ? 'enterfullscreen' : 'exitfullscreen', true);
-
-    // Trap focus in container
-    if (!browser.isIos) {
-        trapFocus.call(this.player, this.target, this.active);
-    }
-}
-
-function toggleFallback(toggle = false) {
-    // Store or restore scroll position
-    if (toggle) {
-        this.scrollPosition = {
-            x: window.scrollX || 0,
-            y: window.scrollY || 0,
-        };
-    } else {
-        window.scrollTo(this.scrollPosition.x, this.scrollPosition.y);
-    }
-
-    // Toggle scroll
-    document.body.style.overflow = toggle ? 'hidden' : '';
-
-    // Toggle class hook
-    toggleClass(this.target, this.player.config.classNames.fullscreen.fallback, toggle);
-
-    // Toggle button and fire events
-    onChange.call(this);
-}
-
 class Fullscreen {
     constructor(player) {
         // Keep reference to parent
@@ -61,6 +21,9 @@ class Fullscreen {
         // Scroll position
         this.scrollPosition = { x: 0, y: 0 };
 
+        // Force the use of 'full window/browser' rather than fullscreen
+        this.forceFallback = player.config.fullscreen.fallback === 'force';
+
         // Register event listeners
         // Handle event (incase user presses escape etc)
         on.call(
@@ -69,7 +32,7 @@ class Fullscreen {
             this.prefix === 'ms' ? 'MSFullscreenChange' : `${this.prefix}fullscreenchange`,
             () => {
                 // TODO: Filter for target??
-                onChange.call(this);
+                this.onChange();
             },
         );
 
@@ -83,6 +46,9 @@ class Fullscreen {
             this.toggle();
         });
 
+        // Tap focus when in fullscreen
+        on.call(this, this.player.elements.container, 'keydown', event => this.trapFocus(event));
+
         // Update the UI
         this.update();
     }
@@ -97,6 +63,11 @@ class Fullscreen {
         );
     }
 
+    // If we're actually using native
+    get usingNative() {
+        return Fullscreen.native && !this.forceFallback;
+    }
+
     // Get the prefix for handlers
     static get prefix() {
         // No prefix
@@ -141,7 +112,7 @@ class Fullscreen {
         }
 
         // Fallback using classname
-        if (!Fullscreen.native) {
+        if (!Fullscreen.native || this.forceFallback) {
             return hasClass(this.target, this.player.config.classNames.fullscreen.fallback);
         }
 
@@ -157,10 +128,111 @@ class Fullscreen {
             : this.player.elements.container;
     }
 
+    onChange() {
+        if (!this.enabled) {
+            return;
+        }
+
+        // Update toggle button
+        const button = this.player.elements.buttons.fullscreen;
+        if (is.element(button)) {
+            button.pressed = this.active;
+        }
+
+        // Trigger an event
+        triggerEvent.call(this.player, this.target, this.active ? 'enterfullscreen' : 'exitfullscreen', true);
+    }
+
+    toggleFallback(toggle = false) {
+        // Store or restore scroll position
+        if (toggle) {
+            this.scrollPosition = {
+                x: window.scrollX || 0,
+                y: window.scrollY || 0,
+            };
+        } else {
+            window.scrollTo(this.scrollPosition.x, this.scrollPosition.y);
+        }
+
+        // Toggle scroll
+        document.body.style.overflow = toggle ? 'hidden' : '';
+
+        // Toggle class hook
+        toggleClass(this.target, this.player.config.classNames.fullscreen.fallback, toggle);
+
+        // Force full viewport on iPhone X+
+        if (browser.isIos) {
+            let viewport = document.head.querySelector('meta[name="viewport"]');
+            const property = 'viewport-fit=cover';
+
+            // Inject the viewport meta if required
+            if (!viewport) {
+                viewport = document.createElement('meta');
+                viewport.setAttribute('name', 'viewport');
+            }
+
+            // Check if the property already exists
+            const hasProperty = is.string(viewport.content) && viewport.content.includes(property);
+
+            if (toggle) {
+                this.cleanupViewport = !hasProperty;
+
+                if (!hasProperty) {
+                    viewport.content += `,${property}`;
+                }
+            } else if (this.cleanupViewport) {
+                viewport.content = viewport.content
+                    .split(',')
+                    .filter(part => part.trim() !== property)
+                    .join(',');
+            }
+        }
+
+        // Toggle button and fire events
+        this.onChange();
+    }
+
+    // Trap focus inside container
+    trapFocus(event) {
+        // Bail if iOS, not active, not the tab key
+        if (browser.isIos || !this.active || event.key !== 'Tab' || event.keyCode !== 9) {
+            return;
+        }
+
+        // Get the current focused element
+        const focused = document.activeElement;
+        const focusable = getElements.call(
+            this.player,
+            'a[href], button:not(:disabled), input:not(:disabled), [tabindex]',
+        );
+        const [first] = focusable;
+        const last = focusable[focusable.length - 1];
+
+        if (focused === last && !event.shiftKey) {
+            // Move focus to first element that can be tabbed if Shift isn't used
+            first.focus();
+            event.preventDefault();
+        } else if (focused === first && event.shiftKey) {
+            // Move focus to last element that can be tabbed if Shift is used
+            last.focus();
+            event.preventDefault();
+        }
+    }
+
     // Update UI
     update() {
         if (this.enabled) {
-            this.player.debug.log(`${Fullscreen.native ? 'Native' : 'Fallback'} fullscreen enabled`);
+            let mode;
+
+            if (this.forceFallback) {
+                mode = 'Fallback (forced)';
+            } else if (Fullscreen.native) {
+                mode = 'Native';
+            } else {
+                mode = 'Fallback';
+            }
+
+            this.player.debug.log(`${mode} fullscreen enabled`);
         } else {
             this.player.debug.log('Fullscreen not supported and fallback disabled');
         }
@@ -178,10 +250,10 @@ class Fullscreen {
         // iOS native fullscreen doesn't need the request step
         if (browser.isIos && this.player.config.fullscreen.iosNative) {
             this.target.webkitEnterFullscreen();
-        } else if (!Fullscreen.native) {
-            toggleFallback.call(this, true);
+        } else if (!Fullscreen.native || this.forceFallback) {
+            this.toggleFallback(true);
         } else if (!this.prefix) {
-            this.target.requestFullscreen();
+            this.target.requestFullscreen({ navigationUI: 'hide' });
         } else if (!is.empty(this.prefix)) {
             this.target[`${this.prefix}Request${this.property}`]();
         }
@@ -197,8 +269,8 @@ class Fullscreen {
         if (browser.isIos && this.player.config.fullscreen.iosNative) {
             this.target.webkitExitFullscreen();
             this.player.play();
-        } else if (!Fullscreen.native) {
-            toggleFallback.call(this, false);
+        } else if (!Fullscreen.native || this.forceFallback) {
+            this.toggleFallback(false);
         } else if (!this.prefix) {
             (document.cancelFullScreen || document.exitFullscreen).call(document);
         } else if (!is.empty(this.prefix)) {

src/js/html5.js

@@ -5,6 +5,8 @@
 import support from './support';
 import { removeElement } from './utils/elements';
 import { triggerEvent } from './utils/events';
+import is from './utils/is';
+import { setAspectRatio } from './utils/style';
 
 const html5 = {
     getSources() {
@@ -14,12 +16,25 @@ const html5 = {
 
         const sources = Array.from(this.media.querySelectorAll('source'));
 
-        // Filter out unsupported sources
-        return sources.filter(source => support.mime.call(this, source.getAttribute('type')));
+        // Filter out unsupported sources (if type is specified)
+        return sources.filter(source => {
+            const type = source.getAttribute('type');
+
+            if (is.empty(type)) {
+                return true;
+            }
+
+            return support.mime.call(this, type);
+        });
     },
 
     // Get quality levels
     getQualityOptions() {
+        // Whether we're forcing all options (e.g. for streaming)
+        if (this.config.quality.forced) {
+            return this.config.quality.options;
+        }
+
         // Get sizes from <source> elements
         return html5.getSources
             .call(this)
@@ -27,64 +42,78 @@ const html5 = {
             .filter(Boolean);
     },
 
-    extend() {
+    setup() {
         if (!this.isHTML5) {
             return;
         }
 
         const player = this;
 
+        // Set speed options from config
+        player.options.speed = player.config.speed.options;
+
+        // Set aspect ratio if fixed
+        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'));
             },
             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);
-
-                // No matching source found
-                if (!source) {
+                if (player.quality === input) {
                     return;
                 }
 
-                // Get current state
-                const { currentTime, paused, preload, readyState } = player.media;
+                // If we're using an an external handler...
+                if (player.config.quality.forced && is.function(player.config.quality.onChange)) {
+                    player.config.quality.onChange(input);
+                } else {
+                    // Get sources
+                    const sources = html5.getSources.call(player);
+                    // Get first match for requested size
+                    const source = sources.find(s => Number(s.getAttribute('size')) === input);
 
-                // Set new source
-                player.media.src = source.getAttribute('src');
+                    // No matching source found
+                    if (!source) {
+                        return;
+                    }
 
-                // Prevent loading if preload="none" and the current source isn't loaded (#1044)
-                if (preload !== 'none' || readyState) {
-                    // Restore time
-                    player.once('loadedmetadata', () => {
-                        player.currentTime = currentTime;
+                    // Get current state
+                    const { currentTime, paused, preload, readyState, playbackRate } = player.media;
 
-                        // Resume playing
-                        if (!paused) {
-                            player.play();
-                        }
-                    });
+                    // Set new source
+                    player.media.src = source.getAttribute('src');
 
-                    // Load new source
-                    player.media.load();
+                    // Prevent loading if preload="none" and the current source isn't loaded (#1044)
+                    if (preload !== 'none' || readyState) {
+                        // Restore time
+                        player.once('loadedmetadata', () => {
+                            player.speed = playbackRate;
+                            player.currentTime = currentTime;
+
+                            // Resume playing
+                            if (!paused) {
+                                player.play();
+                            }
+                        });
+
+                        // Load new source
+                        player.media.load();
+                    }
                 }
 
                 // Trigger change event
                 triggerEvent.call(player, player.media, 'qualitychange', false, {
                     quality: input,
                 });
-
-                // Save to storage
-                player.storage.set({ quality: input });
             },
         });
     },

src/js/listeners.js

@@ -6,9 +6,10 @@ import controls from './controls';
 import ui from './ui';
 import { repaint } from './utils/animation';
 import browser from './utils/browser';
-import { getElement, getElements, hasClass, matches, toggleClass, toggleHidden } from './utils/elements';
-import { on, once, toggleListener, triggerEvent } from './utils/events';
+import { getElement, getElements, matches, toggleClass } from './utils/elements';
+import { off, on, once, toggleListener, triggerEvent } from './utils/events';
 import is from './utils/is';
+import { getAspectRatio, setAspectRatio } from './utils/style';
 
 class Listeners {
     constructor(player) {
@@ -45,7 +46,7 @@ class Listeners {
         // Seek by the number keys
         const seekByKey = () => {
             // Divide the max duration into 10th's and times by the number value
-            player.currentTime = player.duration / 10 * (code - 48);
+            player.currentTime = (player.duration / 10) * (code - 48);
         };
 
         // Handle the key on keydown
@@ -164,7 +165,7 @@ class Listeners {
 
             // Escape is handle natively when in full screen
             // So we only need to worry about non native
-            if (!player.fullscreen.enabled && player.fullscreen.active && code === 27) {
+            if (code === 27 && !player.fullscreen.usingNative && player.fullscreen.active) {
                 player.fullscreen.toggle();
             }
 
@@ -261,10 +262,10 @@ class Listeners {
     // Container listeners
     container() {
         const { player } = this;
-        const { elements } = player;
+        const { config, elements, timers } = player;
 
         // Keyboard shortcuts
-        if (!player.config.keyboard.global && player.config.keyboard.focused) {
+        if (!config.keyboard.global && config.keyboard.focused) {
             on.call(player, elements.container, 'keydown keyup', this.handleKey, false);
         }
 
@@ -274,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') {
-                    controls.pressed = false;
-                    controls.hover = false;
+                if (controlsElement && event.type === 'enterfullscreen') {
+                    controlsElement.pressed = 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) {
@@ -294,12 +294,74 @@ class Listeners {
                 }
 
                 // Clear timer
-                clearTimeout(player.timers.controls);
+                clearTimeout(timers.controls);
 
                 // Set new timer to prevent flicker when seeking
-                player.timers.controls = setTimeout(() => ui.toggleControls.call(player, false), delay);
+                timers.controls = setTimeout(() => ui.toggleControls.call(player, false), delay);
             },
         );
+
+        // Set a gutter for Vimeo
+        const setGutter = (ratio, padding, toggle) => {
+            if (!player.isVimeo) {
+                return;
+            }
+
+            const target = player.elements.wrapper.firstChild;
+            const [, y] = ratio;
+            const [videoX, videoY] = getAspectRatio.call(player);
+
+            target.style.maxWidth = toggle ? `${(y / videoY) * videoX}px` : null;
+            target.style.margin = toggle ? '0 auto' : null;
+        };
+
+        // Resize on fullscreen change
+        const setPlayerSize = measure => {
+            // If we don't need to measure the viewport
+            if (!measure) {
+                return setAspectRatio.call(player);
+            }
+
+            const rect = elements.container.getBoundingClientRect();
+            const { width, height } = rect;
+
+            return setAspectRatio.call(player, `${width}:${height}`);
+        };
+
+        const resized = () => {
+            clearTimeout(timers.resized);
+            timers.resized = setTimeout(setPlayerSize, 50);
+        };
+
+        on.call(player, elements.container, 'enterfullscreen exitfullscreen', event => {
+            const { target, usingNative } = player.fullscreen;
+
+            // Ignore events not from target
+            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);
+
+            // Set Vimeo gutter
+            setGutter(ratio, padding, isEnter);
+
+            // If not using native fullscreen, we need to check for resizes of viewport
+            if (!usingNative) {
+                if (isEnter) {
+                    on.call(player, window, 'resize', resized);
+                } else {
+                    off.call(player, window, 'resize', resized);
+                }
+            }
+        });
     }
 
     // Listen for media events
@@ -315,19 +377,15 @@ class Listeners {
             controls.durationUpdate.call(player, event),
         );
 
-        // Check for audio tracks on load
-        // We can't use `loadedmetadata` as it doesn't seem to have audio tracks at that point
-        on.call(player, player.media, 'canplay', () => {
-            toggleHidden(elements.volume, !player.hasAudio);
-            toggleHidden(elements.buttons.mute, !player.hasAudio);
-        });
-
         // Handle the media finishing
         on.call(player, player.media, 'ended', () => {
             // Show poster on end
             if (player.isHTML5 && player.isVideo && player.config.resetOnEnd) {
                 // Restart
                 player.restart();
+
+                // Call pause otherwise IE11 will start playing the video again
+                player.pause();
             }
         });
 
@@ -347,20 +405,6 @@ class Listeners {
         // Loading state
         on.call(player, player.media, 'waiting canplay seeked playing', event => ui.checkLoading.call(player, event));
 
-        // If autoplay, then load advertisement if required
-        // TODO: Show some sort of loading state while the ad manager loads else there's a delay before ad shows
-        on.call(player, player.media, 'playing', () => {
-            if (!player.ads) {
-                return;
-            }
-
-            // If ads are enabled, wait for them first
-            if (player.ads.enabled && !player.ads.initialized) {
-                // Wait for manager response
-                player.ads.managerPromise.then(() => player.ads.play()).catch(() => player.play());
-            }
-        });
-
         // Click video
         if (player.supported.ui && player.config.clickToPlay && !player.isAudio) {
             // Re-fetch the wrapper
@@ -371,8 +415,8 @@ class Listeners {
                 return;
             }
 
-            // On click play, pause ore restart
-            on.call(player, elements.container, 'click touchstart', event => {
+            // On click play, pause or restart
+            on.call(player, elements.container, 'click', event => {
                 const targets = [elements.container, wrapper];
 
                 // Ignore if click if not container or in video wrapper
@@ -380,21 +424,16 @@ class Listeners {
                     return;
                 }
 
-                // First touch on touch devices will just show controls (if we're hiding controls)
-                // If controls are shown then it'll toggle like a pointer device
-                if (
-                    player.config.hideControls &&
-                    player.touch &&
-                    hasClass(elements.container, player.config.classNames.hideControls)
-                ) {
+                // Touch devices will just show controls (if hidden)
+                if (player.touch && player.config.hideControls) {
                     return;
                 }
 
                 if (player.ended) {
-                    player.restart();
-                    player.play();
+                    this.proxy(event, player.restart, 'restart');
+                    this.proxy(event, player.play, 'play');
                 } else {
-                    player.togglePlay();
+                    this.proxy(event, player.togglePlay, 'play');
                 }
             });
         }
@@ -436,6 +475,11 @@ class Listeners {
             controls.updateSetting.call(player, 'quality', null, event.detail.quality);
         });
 
+        // Update download link when ready and if quality changes
+        on.call(player, player.media, 'ready qualitychange', () => {
+            controls.setDownloadUrl.call(player);
+        });
+
         // Proxy events to container
         // Bubble up key events for Edge
         const proxyEvents = player.config.events.concat(['keyup', 'keydown']).join(' ');
@@ -465,7 +509,7 @@ class Listeners {
         }
 
         // Only call default handler if not prevented in custom handler
-        if (returned && is.function(defaultHandler)) {
+        if (returned !== false && is.function(defaultHandler)) {
             defaultHandler.call(player, event);
         }
     }
@@ -489,7 +533,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';
 
@@ -522,6 +565,16 @@ class Listeners {
         // Captions toggle
         this.bind(elements.buttons.captions, 'click', () => player.toggleCaptions());
 
+        // Download
+        this.bind(
+            elements.buttons.download,
+            'click',
+            () => {
+                triggerEvent.call(player, player.media, 'download');
+            },
+            'download',
+        );
+
         // Fullscreen toggle
         this.bind(
             elements.buttons.fullscreen,
@@ -546,12 +599,19 @@ class Listeners {
         this.bind(elements.buttons.airplay, 'click', player.airplay, 'airplay');
 
         // Settings menu - click toggle
-        this.bind(elements.buttons.settings, 'click', event => {
-            // Prevent the document click listener closing the menu
-            event.stopPropagation();
+        this.bind(
+            elements.buttons.settings,
+            'click',
+            event => {
+                // Prevent the document click listener closing the menu
+                event.stopPropagation();
+                event.preventDefault();
 
-            controls.toggleMenu.call(player, event);
-        });
+                controls.toggleMenu.call(player, event);
+            },
+            null,
+            false
+        ); // Can't be passive as we're preventing default
 
         // Settings menu - keyboard toggle
         // We have to bind to keyup otherwise Firefox triggers a click when a keydown event handler shifts focus
@@ -596,7 +656,7 @@ class Listeners {
         // Set range input alternative "value", which matches the tooltip time (#954)
         this.bind(elements.inputs.seek, 'mousedown mousemove', event => {
             const rect = elements.progress.getBoundingClientRect();
-            const percent = 100 / rect.width * (event.pageX - rect.left);
+            const percent = (100 / rect.width) * (event.pageX - rect.left);
             event.currentTarget.setAttribute('seek-value', percent);
         });
 
@@ -606,13 +666,15 @@ class Listeners {
             const code = event.keyCode ? event.keyCode : event.which;
             const attribute = 'play-on-seeked';
 
-            if (is.keyboardEvent(event) && (code !== 39 && code !== 37)) {
+            if (is.keyboardEvent(event) && code !== 39 && code !== 37) {
                 return;
             }
 
+            // Record seek time so we can prevent hiding controls for a few seconds after seek
+            player.lastSeekTime = Date.now();
+
             // Was playing before?
             const play = seek.hasAttribute(attribute);
-
             // Done seeking
             const done = ['mouseup', 'touchend', 'keyup'].includes(event.type);
 
@@ -640,7 +702,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');
 
@@ -650,7 +711,7 @@ class Listeners {
 
                 seek.removeAttribute('seek-value');
 
-                player.currentTime = seekTo / seek.max * player.duration;
+                player.currentTime = (seekTo / seek.max) * player.duration;
             },
             'seek',
         );
@@ -660,6 +721,42 @@ class Listeners {
             controls.updateSeekTooltip.call(player, event),
         );
 
+        // Preview thumbnails plugin
+        // TODO: Really need to work on some sort of plug-in wide event bus or pub-sub for this
+        this.bind(elements.progress, 'mousemove touchmove', event => {
+            const { previewThumbnails } = player;
+
+            if (previewThumbnails && previewThumbnails.loaded) {
+                previewThumbnails.startMove(event);
+            }
+        });
+
+        // Hide thumbnail preview - on mouse click, mouse leave, and video play/seek. All four are required, e.g., for buffering
+        this.bind(elements.progress, 'mouseleave touchend click', () => {
+            const { previewThumbnails } = player;
+
+            if (previewThumbnails && previewThumbnails.loaded) {
+                previewThumbnails.endMove(false, true);
+            }
+        });
+
+        // Show scrubbing preview
+        this.bind(elements.progress, 'mousedown touchstart', event => {
+            const { previewThumbnails } = player;
+
+            if (previewThumbnails && previewThumbnails.loaded) {
+                previewThumbnails.startScrubbing(event);
+            }
+        });
+
+        this.bind(elements.progress, 'mouseup touchend', event => {
+            const { previewThumbnails } = player;
+
+            if (previewThumbnails && previewThumbnails.loaded) {
+                previewThumbnails.endScrubbing(event);
+            }
+        });
+
         // Polyfill for lower fill in <input type="range"> for webkit
         if (browser.isWebkit) {
             Array.from(getElements.call(player, 'input[type="range"]')).forEach(element => {
@@ -702,33 +799,29 @@ class Listeners {
             elements.controls.pressed = ['mousedown', 'touchstart'].includes(event.type);
         });
 
-        // Focus in/out on controls
-        this.bind(elements.controls, 'focusin focusout', event => {
-            const { config, elements, timers } = player;
-            const isFocusIn = event.type === 'focusin';
+        // Show controls when they receive focus (e.g., when using keyboard tab key)
+        this.bind(elements.controls, 'focusin', () => {
+            const { config, timers } = player;
 
             // Skip transition to prevent focus from scrolling the parent element
-            toggleClass(elements.controls, config.classNames.noTransition, isFocusIn);
+            toggleClass(elements.controls, config.classNames.noTransition, true);
 
             // Toggle
-            ui.toggleControls.call(player, isFocusIn);
+            ui.toggleControls.call(player, true);
 
-            // If focusin, hide again after delay
-            if (isFocusIn) {
-                // Restore transition
-                setTimeout(() => {
-                    toggleClass(elements.controls, config.classNames.noTransition, false);
-                }, 0);
+            // Restore transition
+            setTimeout(() => {
+                toggleClass(elements.controls, config.classNames.noTransition, false);
+            }, 0);
 
-                // Delay a little more for keyboard users
-                const delay = this.touch ? 3000 : 4000;
+            // Delay a little more for mouse users
+            const delay = this.touch ? 3000 : 4000;
 
-                // Clear timer
-                clearTimeout(timers.controls);
+            // Clear timer
+            clearTimeout(timers.controls);
 
-                // Hide
-                timers.controls = setTimeout(() => ui.toggleControls.call(player, false), delay);
-            }
+            // Hide again after delay
+            timers.controls = setTimeout(() => ui.toggleControls.call(player, false), delay);
         });
 
         // Mouse wheel for volume
@@ -739,10 +832,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);
 

src/js/media.js

@@ -39,15 +39,17 @@ const media = {
             wrap(this.media, this.elements.wrapper);
 
             // Faux poster container
-            this.elements.poster = createElement('div', {
-                class: this.config.classNames.poster,
-            });
+            if (this.isEmbed) {
+                this.elements.poster = createElement('div', {
+                    class: this.config.classNames.poster,
+                });
 
-            this.elements.wrapper.appendChild(this.elements.poster);
+                this.elements.wrapper.appendChild(this.elements.poster);
+            }
         }
 
         if (this.isHTML5) {
-            html5.extend.call(this);
+            html5.setup.call(this);
         } else if (this.isYouTube) {
             youtube.setup.call(this);
         } else if (this.isVimeo) {

src/js/plugins/ads.js

@@ -10,19 +10,33 @@ 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';
 
+const destroy = instance => {
+    // Destroy our adsManager
+    if (instance.manager) {
+        instance.manager.destroy();
+    }
+
+    // Destroy our adsManager
+    if (instance.elements.displayContainer) {
+        instance.elements.displayContainer.destroy();
+    }
+
+    instance.elements.container.remove();
+};
+
 class Ads {
     /**
      * Ads constructor.
-     * @param {object} player
+     * @param {Object} player
      * @return {Ads}
      */
     constructor(player) {
         this.player = player;
-        this.publisherId = player.config.ads.publisherId;
+        this.config = player.config.ads;
         this.playing = false;
         this.initialized = false;
         this.elements = {
@@ -49,8 +63,13 @@ class Ads {
     }
 
     get enabled() {
+        const { config } = this;
+
         return (
-            this.player.isHTML5 && this.player.isVideo && this.player.config.ads.enabled && !is.empty(this.publisherId)
+            this.player.isHTML5 &&
+            this.player.isVideo &&
+            config.enabled &&
+            (!is.empty(config.publisherId) || is.url(config.tagUrl))
         );
     }
 
@@ -58,20 +77,22 @@ class Ads {
      * Load the IMA SDK
      */
     load() {
-        if (this.enabled) {
-            // Check if the Google IMA3 SDK is loaded or load it ourselves
-            if (!is.object(window.google) || !is.object(window.google.ima)) {
-                loadScript(this.player.config.urls.googleIMA.sdk)
-                    .then(() => {
-                        this.ready();
-                    })
-                    .catch(() => {
-                        // Script failed to load or is blocked
-                        this.trigger('error', new Error('Google IMA SDK failed to load'));
-                    });
-            } else {
-                this.ready();
-            }
+        if (!this.enabled) {
+            return;
+        }
+
+        // Check if the Google IMA3 SDK is loaded or load it ourselves
+        if (!is.object(window.google) || !is.object(window.google.ima)) {
+            loadScript(this.player.config.urls.googleIMA.sdk)
+                .then(() => {
+                    this.ready();
+                })
+                .catch(() => {
+                    // Script failed to load or is blocked
+                    this.trigger('error', new Error('Google IMA SDK failed to load'));
+                });
+        } else {
+            this.ready();
         }
     }
 
@@ -79,6 +100,11 @@ class Ads {
      * Get the ads instance ready
      */
     ready() {
+        // Double check we're enabled
+        if (!this.enabled) {
+            destroy(this);
+        }
+
         // Start ticking our safety timer. If the whole advertisement
         // thing doesn't resolve within our set time; we bail
         this.startSafetyTimer(12000, 'ready()');
@@ -95,8 +121,14 @@ class Ads {
         this.setupIMA();
     }
 
-    // Build the default tag URL
+    // Build the tag URL
     get tagUrl() {
+        const { config } = this;
+
+        if (is.url(config.tagUrl)) {
+            return config.tagUrl;
+        }
+
         const params = {
             AV_PUBLISHERID: '58c25bb0073ef448b1087ad6',
             AV_CHANNELID: '5a0458dc28a06145e4519d21',
@@ -104,7 +136,7 @@ class Ads {
             cb: Date.now(),
             AV_WIDTH: 640,
             AV_HEIGHT: 480,
-            AV_CDIM2: this.publisherId,
+            AV_CDIM2: config.publisherId,
         };
 
         const base = 'https://go.aniview.com/api/adserver6/vast/';
@@ -125,6 +157,7 @@ class Ads {
         this.elements.container = createElement('div', {
             class: this.player.config.classNames.ads,
         });
+
         this.player.elements.container.appendChild(this.elements.container);
 
         // So we can run VPAID2
@@ -133,9 +166,11 @@ class Ads {
         // Set language
         google.ima.settings.setLocale(this.player.config.ads.language);
 
-        // We assume the adContainer is the video container of the plyr element
-        // that will house the ads
-        this.elements.displayContainer = new google.ima.AdDisplayContainer(this.elements.container);
+        // Set playback for iOS10+
+        google.ima.settings.setDisableCustomPlaybackForIOS10Plus(this.player.config.playsinline);
+
+        // We assume the adContainer is the video container of the plyr element that will house the ads
+        this.elements.displayContainer = new google.ima.AdDisplayContainer(this.elements.container, this.player.media);
 
         // Request video ads to be pre-loaded
         this.requestAds();
@@ -184,7 +219,7 @@ class Ads {
 
     /**
      * Update the ad countdown
-     * @param {boolean} start
+     * @param {Boolean} start
      */
     pollCountdown(start = false) {
         if (!start) {
@@ -226,6 +261,20 @@ class Ads {
         // Get the cue points for any mid-rolls by filtering out the pre- and post-roll
         this.cuePoints = this.manager.getCuePoints();
 
+        // Add listeners to the required events
+        // Advertisement error events
+        this.manager.addEventListener(google.ima.AdErrorEvent.Type.AD_ERROR, error => this.onAdError(error));
+
+        // Advertisement regular events
+        Object.keys(google.ima.AdEvent.Type).forEach(type => {
+            this.manager.addEventListener(google.ima.AdEvent.Type[type], e => this.onAdEvent(e));
+        });
+
+        // Resolve our adsManager
+        this.trigger('loaded');
+    }
+
+    addCuePoints() {
         // Add advertisement cue's within the time line if available
         if (!is.empty(this.cuePoints)) {
             this.cuePoints.forEach(cuePoint => {
@@ -233,7 +282,7 @@ class Ads {
                     const seekElement = this.player.elements.progress;
 
                     if (is.element(seekElement)) {
-                        const cuePercentage = 100 / this.player.duration * cuePoint;
+                        const cuePercentage = (100 / this.player.duration) * cuePoint;
                         const cue = createElement('span', {
                             class: this.player.config.classNames.cues,
                         });
@@ -244,21 +293,6 @@ class Ads {
                 }
             });
         }
-
-        // Set volume to match player
-        this.manager.setVolume(this.player.volume);
-
-        // Add listeners to the required events
-        // Advertisement error events
-        this.manager.addEventListener(google.ima.AdErrorEvent.Type.AD_ERROR, error => this.onAdError(error));
-
-        // Advertisement regular events
-        Object.keys(google.ima.AdEvent.Type).forEach(type => {
-            this.manager.addEventListener(google.ima.AdEvent.Type[type], event => this.onAdEvent(event));
-        });
-
-        // Resolve our adsManager
-        this.trigger('loaded');
     }
 
     /**
@@ -269,26 +303,25 @@ 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();
+        const adData = event.getAdData();
 
         // Proxy event
         const dispatchEvent = type => {
-            const event = `ads${type.replace(/_/g, '').toLowerCase()}`;
-            triggerEvent.call(this.player, this.player.media, event);
+            triggerEvent.call(this.player, this.player.media, `ads${type.replace(/_/g, '').toLowerCase()}`);
         };
 
+        // Bubble the event
+        dispatchEvent(event.type);
+
         switch (event.type) {
             case google.ima.AdEvent.Type.LOADED:
                 // This is the first event sent for an ad - it is possible to determine whether the
                 // ad is a video ad or an overlay
                 this.trigger('loaded');
 
-                // Bubble event
-                dispatchEvent(event.type);
-
                 // Start countdown
                 this.pollCountdown(true);
 
@@ -300,15 +333,19 @@ class Ads {
 
                 // console.info('Ad type: ' + event.getAd().getAdPodInfo().getPodIndex());
                 // console.info('Ad time: ' + event.getAd().getAdPodInfo().getTimeOffset());
+
+                break;
+
+            case google.ima.AdEvent.Type.STARTED:
+                // Set volume to match player
+                this.manager.setVolume(this.player.volume);
+
                 break;
 
             case google.ima.AdEvent.Type.ALL_ADS_COMPLETED:
                 // All ads for the current videos are done. We can now request new advertisements
                 // in case the video is re-played
 
-                // Fire event
-                dispatchEvent(event.type);
-
                 // TODO: Example for what happens when a next video in a playlist would be loaded.
                 // So here we load a new video when all ads are done.
                 // Then we load new ads within a new adsManager. When the video
@@ -333,6 +370,7 @@ class Ads {
                 // playing when the IMA SDK is ready or has failed
 
                 this.loadAds();
+
                 break;
 
             case google.ima.AdEvent.Type.CONTENT_PAUSE_REQUESTED:
@@ -340,8 +378,6 @@ class Ads {
                 // for example display a pause button and remaining time. Fired when content should
                 // be paused. This usually happens right before an ad is about to cover the content
 
-                dispatchEvent(event.type);
-
                 this.pauseContent();
 
                 break;
@@ -352,20 +388,17 @@ class Ads {
                 // Fired when content should be resumed. This usually happens when an ad finishes
                 // or collapses
 
-                dispatchEvent(event.type);
-
                 this.pollCountdown();
 
                 this.resumeContent();
 
                 break;
 
-            case google.ima.AdEvent.Type.STARTED:
-            case google.ima.AdEvent.Type.MIDPOINT:
-            case google.ima.AdEvent.Type.COMPLETE:
-            case google.ima.AdEvent.Type.IMPRESSION:
-            case google.ima.AdEvent.Type.CLICK:
-                dispatchEvent(event.type);
+            case google.ima.AdEvent.Type.LOG:
+                if (adData.adError) {
+                    this.player.debug.warn(`Non-fatal ad error: ${adData.adError.getMessage()}`);
+                }
+
                 break;
 
             default:
@@ -391,14 +424,16 @@ class Ads {
         const { container } = this.player.elements;
         let time;
 
-        // Add listeners to the required events
+        this.player.on('canplay', () => {
+            this.addCuePoints();
+        });
+
         this.player.on('ended', () => {
             this.loader.contentComplete();
         });
 
-        this.player.on('seeking', () => {
+        this.player.on('timeupdate', () => {
             time = this.player.currentTime;
-            return time;
         });
 
         this.player.on('seeked', () => {
@@ -438,6 +473,9 @@ class Ads {
         // Play the requested advertisement whenever the adsManager is ready
         this.managerPromise
             .then(() => {
+                // Set volume to match player
+                this.manager.setVolume(this.player.volume);
+
                 // Initialize the container. Must be done via a user action on mobile devices
                 this.elements.displayContainer.initialize();
 
@@ -471,10 +509,8 @@ class Ads {
         // Ad is stopped
         this.playing = false;
 
-        // Play our video
-        if (this.player.currentTime < this.player.duration) {
-            this.player.play();
-        }
+        // Play video
+        this.player.media.play();
     }
 
     /**
@@ -484,11 +520,11 @@ class Ads {
         // Show the advertisement container
         this.elements.container.style.zIndex = 3;
 
-        // Ad is playing.
+        // Ad is playing
         this.playing = true;
 
         // Pause our video.
-        this.player.pause();
+        this.player.media.pause();
     }
 
     /**
@@ -536,7 +572,7 @@ class Ads {
 
     /**
      * Handles callbacks after an ad event was invoked
-     * @param {string} event - Event type
+     * @param {String} event - Event type
      */
     trigger(event, ...args) {
         const handlers = this.events[event];
@@ -552,8 +588,8 @@ class Ads {
 
     /**
      * Add event listeners
-     * @param {string} event - Event type
-     * @param {function} callback - Callback for when event occurs
+     * @param {String} event - Event type
+     * @param {Function} callback - Callback for when event occurs
      * @return {Ads}
      */
     on(event, callback) {
@@ -571,8 +607,8 @@ class Ads {
      * The advertisement has 12 seconds to get its things together. We stop this timer when the
      * advertisement is playing, or when a user action is required to start, then we clear the
      * timer on ad ready
-     * @param {number} time
-     * @param {string} from
+     * @param {Number} time
+     * @param {String} from
      */
     startSafetyTimer(time, from) {
         this.player.debug.log(`Safety timer invoked from: ${from}`);
@@ -585,7 +621,7 @@ class Ads {
 
     /**
      * Clear our safety timer(s)
-     * @param {string} from
+     * @param {String} from
      */
     clearSafetyTimer(from) {
         if (!is.nullOrUndefined(this.safetyTimer)) {

src/js/plugins/preview-thumbnails.js

@@ -0,0 +1,692 @@
+import { createElement } from '../utils/elements';
+import { once } from '../utils/events';
+import fetch from '../utils/fetch';
+import is from '../utils/is';
+import { formatTime } from '../utils/time';
+
+// Arg: vttDataString example: "WEBVTT\n\n1\n00:00:05.000 --> 00:00:10.000\n1080p-00001.jpg"
+const parseVtt = vttDataString => {
+    const processedList = [];
+    const frames = vttDataString.split(/\r\n\r\n|\n\n|\r\r/);
+
+    frames.forEach(frame => {
+        const result = {};
+        const lines = frame.split(/\r\n|\n|\r/);
+
+        lines.forEach(line => {
+            if (!is.number(result.startTime)) {
+                // The line with start and end times on it is the first line of interest
+                const matchTimes = line.match(
+                    /([0-9]{2})?:?([0-9]{2}):([0-9]{2}).([0-9]{2,3})( ?--> ?)([0-9]{2})?:?([0-9]{2}):([0-9]{2}).([0-9]{2,3})/,
+                ); // Note that this currently ignores caption formatting directives that are optionally on the end of this line - fine for non-captions VTT
+
+                if (matchTimes) {
+                    result.startTime =
+                        Number(matchTimes[1] || 0) * 60 * 60 +
+                        Number(matchTimes[2]) * 60 +
+                        Number(matchTimes[3]) +
+                        Number(`0.${matchTimes[4]}`);
+                    result.endTime =
+                        Number(matchTimes[6] || 0) * 60 * 60 +
+                        Number(matchTimes[7]) * 60 +
+                        Number(matchTimes[8]) +
+                        Number(`0.${matchTimes[9]}`);
+                }
+            } else if (!is.empty(line.trim()) && is.empty(result.text)) {
+                // If we already have the startTime, then we're definitely up to the text line(s)
+                const lineSplit = line.trim().split('#xywh=');
+                [result.text] = lineSplit;
+
+                // If there's content in lineSplit[1], then we have sprites. If not, then it's just one frame per image
+                if (lineSplit[1]) {
+                    [result.x, result.y, result.w, result.h] = lineSplit[1].split(',');
+                }
+            }
+        });
+
+        if (result.text) {
+            processedList.push(result);
+        }
+    });
+
+    return processedList;
+};
+
+/**
+ * Preview thumbnails for seek hover and scrubbing
+ * Seeking: Hover over the seek bar (desktop only): shows a small preview container above the seek bar
+ * Scrubbing: Click and drag the seek bar (desktop and mobile): shows the preview image over the entire video, as if the video is scrubbing at very high speed
+ *
+ * Notes:
+ * - Thumbs are set via JS settings on Plyr init, not HTML5 'track' property. Using the track property would be a bit gross, because it doesn't support custom 'kinds'. kind=metadata might be used for something else, and we want to allow multiple thumbnails tracks. Tracks must have a unique combination of 'kind' and 'label'. We would have to do something like kind=metadata,label=thumbnails1 / kind=metadata,label=thumbnails2. Square peg, round hole
+ * - VTT info: the image URL is relative to the VTT, not the current document. But if the url starts with a slash, it will naturally be relative to the current domain. https://support.jwplayer.com/articles/how-to-add-preview-thumbnails
+ * - This implementation uses multiple separate img elements. Other implementations use background-image on one element. This would be nice and simple, but Firefox and Safari have flickering issues with replacing backgrounds of larger images. It seems that YouTube perhaps only avoids this because they don't have the option for high-res previews (even the fullscreen ones, when mousedown/seeking). Images appear over the top of each other, and previous ones are discarded once the new ones have been rendered
+ */
+
+const fitRatio = (ratio, outer) => {
+    const targetRatio = outer.width / outer.height;
+    const result = {};
+    if (ratio > targetRatio) {
+        result.width = outer.width;
+        result.height = (1 / ratio) * outer.width;
+    } else {
+        result.height = outer.height;
+        result.width = ratio * outer.height;
+    }
+
+    return result;
+};
+
+class PreviewThumbnails {
+    /**
+     * PreviewThumbnails constructor.
+     * @param {Plyr} player
+     * @return {PreviewThumbnails}
+     */
+    constructor(player) {
+        this.player = player;
+        this.thumbnails = [];
+        this.loaded = false;
+        this.lastMouseMoveTime = Date.now();
+        this.mouseDown = false;
+        this.loadedImages = [];
+
+        this.elements = {
+            thumb: {},
+            scrubbing: {},
+        };
+
+        this.load();
+    }
+
+    get enabled() {
+        return this.player.isHTML5 && this.player.isVideo && this.player.config.previewThumbnails.enabled;
+    }
+
+    load() {
+        // Toggle the regular seek tooltip
+        if (this.player.elements.display.seekTooltip) {
+            this.player.elements.display.seekTooltip.hidden = this.enabled;
+        }
+
+        if (!this.enabled) {
+            return;
+        }
+
+        this.getThumbnails().then(() => {
+            if (!this.enabled) {
+                return;
+            }
+
+            // Render DOM elements
+            this.render();
+
+            // Check to see if thumb container size was specified manually in CSS
+            this.determineContainerAutoSizing();
+
+            this.loaded = true;
+        });
+    }
+
+    // Download VTT files and parse them
+    getThumbnails() {
+        return new Promise(resolve => {
+            const { src } = this.player.config.previewThumbnails;
+
+            if (is.empty(src)) {
+                throw new Error('Missing previewThumbnails.src config attribute');
+            }
+
+            // 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));
+
+            Promise.all(promises).then(() => {
+                // Sort smallest to biggest (e.g., [120p, 480p, 1080p])
+                this.thumbnails.sort((x, y) => x.height - y.height);
+
+                this.player.debug.log('Preview thumbnails', this.thumbnails);
+
+                resolve();
+            });
+        });
+    }
+
+    // Process individual VTT file
+    getThumbnail(url) {
+        return new Promise(resolve => {
+            fetch(url).then(response => {
+                const thumbnail = {
+                    frames: parseVtt(response),
+                    height: null,
+                    urlPrefix: '',
+                };
+
+                // If the URLs don't start with '/', then we need to set their relative path to be the location of the VTT file
+                // If the URLs do start with '/', then they obviously don't need a prefix, so it will remain blank
+                // If the thumbnail URLs start with with none of '/', 'http://' or 'https://', then we need to set their relative path to be the location of the VTT file
+                if (
+                    !thumbnail.frames[0].text.startsWith('/') &&
+                    !thumbnail.frames[0].text.startsWith('http://') &&
+                    !thumbnail.frames[0].text.startsWith('https://')
+                ) {
+                    thumbnail.urlPrefix = url.substring(0, url.lastIndexOf('/') + 1);
+                }
+
+                // Download the first frame, so that we can determine/set the height of this thumbnailsDef
+                const tempImage = new Image();
+
+                tempImage.onload = () => {
+                    thumbnail.height = tempImage.naturalHeight;
+                    thumbnail.width = tempImage.naturalWidth;
+
+                    this.thumbnails.push(thumbnail);
+
+                    resolve();
+                };
+
+                tempImage.src = thumbnail.urlPrefix + thumbnail.frames[0].text;
+            });
+        });
+    }
+
+    startMove(event) {
+        if (!this.loaded) {
+            return;
+        }
+
+        if (!is.event(event) || !['touchmove', 'mousemove'].includes(event.type)) {
+            return;
+        }
+
+        // Wait until media has a duration
+        if (!this.player.media.duration) {
+            return;
+        }
+
+        if (event.type === 'touchmove') {
+            // Calculate seek hover position as approx video seconds
+            this.seekTime = this.player.media.duration * (this.player.elements.inputs.seek.value / 100);
+        } else {
+            // Calculate seek hover position as approx video seconds
+            const clientRect = this.player.elements.progress.getBoundingClientRect();
+            const percentage = (100 / clientRect.width) * (event.pageX - clientRect.left);
+            this.seekTime = this.player.media.duration * (percentage / 100);
+
+            if (this.seekTime < 0) {
+                // The mousemove fires for 10+px out to the left
+                this.seekTime = 0;
+            }
+
+            if (this.seekTime > this.player.media.duration - 1) {
+                // Took 1 second off the duration for safety, because different players can disagree on the real duration of a video
+                this.seekTime = this.player.media.duration - 1;
+            }
+
+            this.mousePosX = event.pageX;
+
+            // Set time text inside image container
+            this.elements.thumb.time.innerText = formatTime(this.seekTime);
+        }
+
+        // Download and show image
+        this.showImageAtCurrentTime();
+    }
+
+    endMove() {
+        this.toggleThumbContainer(false, true);
+    }
+
+    startScrubbing(event) {
+        // Only act on left mouse button (0), or touch device (event.button does not exist or is false)
+        if (is.nullOrUndefined(event.button) || event.button === false || event.button === 0) {
+            this.mouseDown = true;
+
+            // Wait until media has a duration
+            if (this.player.media.duration) {
+                this.toggleScrubbingContainer(true);
+                this.toggleThumbContainer(false, true);
+
+                // Download and show image
+                this.showImageAtCurrentTime();
+            }
+        }
+    }
+
+    endScrubbing() {
+        this.mouseDown = false;
+
+        // Hide scrubbing preview. But wait until the video has successfully seeked before hiding the scrubbing preview
+        if (Math.ceil(this.lastTime) === Math.ceil(this.player.media.currentTime)) {
+            // The video was already seeked/loaded at the chosen time - hide immediately
+            this.toggleScrubbingContainer(false);
+        } else {
+            // The video hasn't seeked yet. Wait for that
+            once.call(this.player, this.player.media, 'timeupdate', () => {
+                // Re-check mousedown - we might have already started scrubbing again
+                if (!this.mouseDown) {
+                    this.toggleScrubbingContainer(false);
+                }
+            });
+        }
+    }
+
+    /**
+     * Setup hooks for Plyr and window events
+     */
+    listeners() {
+        // Hide thumbnail preview - on mouse click, mouse leave (in listeners.js for now), and video play/seek. All four are required, e.g., for buffering
+        this.player.on('play', () => {
+            this.toggleThumbContainer(false, true);
+        });
+
+        this.player.on('seeked', () => {
+            this.toggleThumbContainer(false);
+        });
+
+        this.player.on('timeupdate', () => {
+            this.lastTime = this.player.media.currentTime;
+        });
+    }
+
+    /**
+     * Create HTML elements for image containers
+     */
+    render() {
+        // Create HTML element: plyr__preview-thumbnail-container
+        this.elements.thumb.container = createElement('div', {
+            class: this.player.config.classNames.previewThumbnails.thumbContainer,
+        });
+
+        // Wrapper for the image for styling
+        this.elements.thumb.imageContainer = createElement('div', {
+            class: this.player.config.classNames.previewThumbnails.imageContainer,
+        });
+        this.elements.thumb.container.appendChild(this.elements.thumb.imageContainer);
+
+        // Create HTML element, parent+span: time text (e.g., 01:32:00)
+        const timeContainer = createElement('div', {
+            class: this.player.config.classNames.previewThumbnails.timeContainer,
+        });
+
+        this.elements.thumb.time = createElement('span', {}, '00:00');
+        timeContainer.appendChild(this.elements.thumb.time);
+
+        this.elements.thumb.container.appendChild(timeContainer);
+
+        // Inject the whole thumb
+        if (is.element(this.player.elements.progress)) {
+            this.player.elements.progress.appendChild(this.elements.thumb.container);
+        }
+
+        // Create HTML element: plyr__preview-scrubbing-container
+        this.elements.scrubbing.container = createElement('div', {
+            class: this.player.config.classNames.previewThumbnails.scrubbingContainer,
+        });
+
+        this.player.elements.wrapper.appendChild(this.elements.scrubbing.container);
+    }
+
+    destroy() {
+        if (this.elements.thumb.container) {
+            this.elements.thumb.container.remove();
+        }
+        if (this.elements.scrubbing.container) {
+            this.elements.scrubbing.container.remove();
+        }
+    }
+
+    showImageAtCurrentTime() {
+        if (this.mouseDown) {
+            this.setScrubbingContainerSize();
+        } else {
+            this.setThumbContainerSizeAndPos();
+        }
+
+        // Find the desired thumbnail index
+        // TODO: Handle a video longer than the thumbs where thumbNum is null
+        const thumbNum = this.thumbnails[0].frames.findIndex(
+            frame => this.seekTime >= frame.startTime && this.seekTime <= frame.endTime,
+        );
+        const hasThumb = thumbNum >= 0;
+        let qualityIndex = 0;
+
+        // Show the thumb container if we're not scrubbing
+        if (!this.mouseDown) {
+            this.toggleThumbContainer(hasThumb);
+        }
+
+        // No matching thumb found
+        if (!hasThumb) {
+            return;
+        }
+
+        // Check to see if we've already downloaded higher quality versions of this image
+        this.thumbnails.forEach((thumbnail, index) => {
+            if (this.loadedImages.includes(thumbnail.frames[thumbNum].text)) {
+                qualityIndex = index;
+            }
+        });
+
+        // Only proceed if either thumbnum or thumbfilename has changed
+        if (thumbNum !== this.showingThumb) {
+            this.showingThumb = thumbNum;
+            this.loadImage(qualityIndex);
+        }
+    }
+
+    // Show the image that's currently specified in this.showingThumb
+    loadImage(qualityIndex = 0) {
+        const thumbNum = this.showingThumb;
+        const thumbnail = this.thumbnails[qualityIndex];
+        const { urlPrefix } = thumbnail;
+        const frame = thumbnail.frames[thumbNum];
+        const thumbFilename = thumbnail.frames[thumbNum].text;
+        const thumbUrl = urlPrefix + thumbFilename;
+
+        if (!this.currentImageElement || this.currentImageElement.dataset.filename !== thumbFilename) {
+            // If we're already loading a previous image, remove its onload handler - we don't want it to load after this one
+            // Only do this if not using sprites. Without sprites we really want to show as many images as possible, as a best-effort
+            if (this.loadingImage && this.usingSprites) {
+                this.loadingImage.onload = null;
+            }
+
+            // We're building and adding a new image. In other implementations of similar functionality (YouTube), background image
+            // is instead used. But this causes issues with larger images in Firefox and Safari - switching between background
+            // images causes a flicker. Putting a new image over the top does not
+            const previewImage = new Image();
+            previewImage.src = thumbUrl;
+            previewImage.dataset.index = thumbNum;
+            previewImage.dataset.filename = thumbFilename;
+            this.showingThumbFilename = thumbFilename;
+
+            this.player.debug.log(`Loading image: ${thumbUrl}`);
+
+            // For some reason, passing the named function directly causes it to execute immediately. So I've wrapped it in an anonymous function...
+            previewImage.onload = () =>
+                this.showImage(previewImage, frame, qualityIndex, thumbNum, thumbFilename, true);
+            this.loadingImage = previewImage;
+            this.removeOldImages(previewImage);
+        } else {
+            // Update the existing image
+            this.showImage(this.currentImageElement, frame, qualityIndex, thumbNum, thumbFilename, false);
+            this.currentImageElement.dataset.index = thumbNum;
+            this.removeOldImages(this.currentImageElement);
+        }
+    }
+
+    showImage(previewImage, frame, qualityIndex, thumbNum, thumbFilename, newImage = true) {
+        this.player.debug.log(
+            `Showing thumb: ${thumbFilename}. num: ${thumbNum}. qual: ${qualityIndex}. newimg: ${newImage}`,
+        );
+        this.setImageSizeAndOffset(previewImage, frame);
+
+        if (newImage) {
+            this.currentImageContainer.appendChild(previewImage);
+            this.currentImageElement = previewImage;
+
+            if (!this.loadedImages.includes(thumbFilename)) {
+                this.loadedImages.push(thumbFilename);
+            }
+        }
+
+        // Preload images before and after the current one
+        // Show higher quality of the same frame
+        // Each step here has a short time delay, and only continues if still hovering/seeking the same spot. This is to protect slow connections from overloading
+        this.preloadNearby(thumbNum, true)
+            .then(this.preloadNearby(thumbNum, false))
+            .then(this.getHigherQuality(qualityIndex, previewImage, frame, thumbFilename));
+    }
+
+    // Remove all preview images that aren't the designated current image
+    removeOldImages(currentImage) {
+        // Get a list of all images, convert it from a DOM list to an array
+        Array.from(this.currentImageContainer.children).forEach(image => {
+            if (image.tagName.toLowerCase() !== 'img') {
+                return;
+            }
+
+            const removeDelay = this.usingSprites ? 500 : 1000;
+
+            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;
+
+                setTimeout(() => {
+                    currentImageContainer.removeChild(image);
+                    this.player.debug.log(`Removing thumb: ${image.dataset.filename}`);
+                }, removeDelay);
+            }
+        });
+    }
+
+    // Preload images before and after the current one. Only if the user is still hovering/seeking the same frame
+    // This will only preload the lowest quality
+    preloadNearby(thumbNum, forward = true) {
+        return new Promise(resolve => {
+            setTimeout(() => {
+                const oldThumbFilename = this.thumbnails[0].frames[thumbNum].text;
+
+                if (this.showingThumbFilename === oldThumbFilename) {
+                    // Find the nearest thumbs with different filenames. Sometimes it'll be the next index, but in the case of sprites, it might be 100+ away
+                    let thumbnailsClone;
+                    if (forward) {
+                        thumbnailsClone = this.thumbnails[0].frames.slice(thumbNum);
+                    } else {
+                        thumbnailsClone = this.thumbnails[0].frames.slice(0, thumbNum).reverse();
+                    }
+
+                    let foundOne = false;
+
+                    thumbnailsClone.forEach(frame => {
+                        const newThumbFilename = frame.text;
+
+                        if (newThumbFilename !== oldThumbFilename) {
+                            // Found one with a different filename. Make sure it hasn't already been loaded on this page visit
+                            if (!this.loadedImages.includes(newThumbFilename)) {
+                                foundOne = true;
+                                this.player.debug.log(`Preloading thumb filename: ${newThumbFilename}`);
+
+                                const { urlPrefix } = this.thumbnails[0];
+                                const thumbURL = urlPrefix + newThumbFilename;
+                                const previewImage = new Image();
+                                previewImage.src = thumbURL;
+                                previewImage.onload = () => {
+                                    this.player.debug.log(`Preloaded thumb filename: ${newThumbFilename}`);
+                                    if (!this.loadedImages.includes(newThumbFilename))
+                                        this.loadedImages.push(newThumbFilename);
+
+                                    // We don't resolve until the thumb is loaded
+                                    resolve();
+                                };
+                            }
+                        }
+                    });
+
+                    // If there are none to preload then we want to resolve immediately
+                    if (!foundOne) {
+                        resolve();
+                    }
+                }
+            }, 300);
+        });
+    }
+
+    // If user has been hovering current image for half a second, look for a higher quality one
+    getHigherQuality(currentQualityIndex, previewImage, frame, thumbFilename) {
+        if (currentQualityIndex < this.thumbnails.length - 1) {
+            // Only use the higher quality version if it's going to look any better - if the current thumb is of a lower pixel density than the thumbnail container
+            let previewImageHeight = previewImage.naturalHeight;
+
+            if (this.usingSprites) {
+                previewImageHeight = frame.h;
+            }
+
+            if (previewImageHeight < this.thumbContainerHeight) {
+                // Recurse back to the loadImage function - show a higher quality one, but only if the viewer is on this frame for a while
+                setTimeout(() => {
+                    // Make sure the mouse hasn't already moved on and started hovering at another image
+                    if (this.showingThumbFilename === thumbFilename) {
+                        this.player.debug.log(`Showing higher quality thumb for: ${thumbFilename}`);
+                        this.loadImage(currentQualityIndex + 1);
+                    }
+                }, 300);
+            }
+        }
+    }
+
+    get currentImageContainer() {
+        if (this.mouseDown) {
+            return this.elements.scrubbing.container;
+        }
+
+        return this.elements.thumb.imageContainer;
+    }
+
+    get usingSprites() {
+        return Object.keys(this.thumbnails[0].frames[0]).includes('w');
+    }
+
+    get thumbAspectRatio() {
+        if (this.usingSprites) {
+            return this.thumbnails[0].frames[0].w / this.thumbnails[0].frames[0].h;
+        }
+
+        return this.thumbnails[0].width / this.thumbnails[0].height;
+    }
+
+    get thumbContainerHeight() {
+        if (this.mouseDown) {
+            const { height } = fitRatio(this.thumbAspectRatio, {
+                width: this.player.media.clientWidth,
+                height: this.player.media.clientHeight,
+            });
+            return height;
+        }
+
+        // If css is used this needs to return the css height for sprites to work (see setImageSizeAndOffset)
+        if (this.sizeSpecifiedInCSS) {
+            return this.elements.thumb.imageContainer.clientHeight;
+        }
+
+        return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio / 4);
+    }
+
+    get currentImageElement() {
+        if (this.mouseDown) {
+            return this.currentScrubbingImageElement;
+        }
+
+        return this.currentThumbnailImageElement;
+    }
+
+    set currentImageElement(element) {
+        if (this.mouseDown) {
+            this.currentScrubbingImageElement = element;
+        } else {
+            this.currentThumbnailImageElement = element;
+        }
+    }
+
+    toggleThumbContainer(toggle = false, clearShowing = false) {
+        const className = this.player.config.classNames.previewThumbnails.thumbContainerShown;
+        this.elements.thumb.container.classList.toggle(className, toggle);
+
+        if (!toggle && clearShowing) {
+            this.showingThumb = null;
+            this.showingThumbFilename = null;
+        }
+    }
+
+    toggleScrubbingContainer(toggle = false) {
+        const className = this.player.config.classNames.previewThumbnails.scrubbingContainerShown;
+        this.elements.scrubbing.container.classList.toggle(className, toggle);
+
+        if (!toggle) {
+            this.showingThumb = null;
+            this.showingThumbFilename = null;
+        }
+    }
+
+    determineContainerAutoSizing() {
+        if (this.elements.thumb.imageContainer.clientHeight > 20 || this.elements.thumb.imageContainer.clientWidth > 20) {
+            // This will prevent auto sizing in this.setThumbContainerSizeAndPos()
+            this.sizeSpecifiedInCSS = true;
+        }
+    }
+
+    // Set the size to be about a quarter of the size of video. Unless option dynamicSize === false, in which case it needs to be set in CSS
+    setThumbContainerSizeAndPos() {
+        if (!this.sizeSpecifiedInCSS) {
+            const thumbWidth = Math.floor(this.thumbContainerHeight * this.thumbAspectRatio);
+            this.elements.thumb.imageContainer.style.height = `${this.thumbContainerHeight}px`;
+            this.elements.thumb.imageContainer.style.width = `${thumbWidth}px`;
+        } else if (this.elements.thumb.imageContainer.clientHeight > 20 && this.elements.thumb.imageContainer.clientWidth < 20) {
+            const thumbWidth = Math.floor(this.elements.thumb.imageContainer.clientHeight * this.thumbAspectRatio);
+            this.elements.thumb.imageContainer.style.width = `${thumbWidth}px`;
+        } else if (this.elements.thumb.imageContainer.clientHeight < 20 && this.elements.thumb.imageContainer.clientWidth > 20) {
+            const thumbHeight = Math.floor(this.elements.thumb.imageContainer.clientWidth / this.thumbAspectRatio);
+            this.elements.thumb.imageContainer.style.height = `${thumbHeight}px`;
+        }
+
+        this.setThumbContainerPos();
+    }
+
+    setThumbContainerPos() {
+        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;
+
+        if (previewPos < minVal) {
+            previewPos = minVal;
+        }
+
+        if (previewPos > maxVal) {
+            previewPos = maxVal;
+        }
+
+        container.style.left = `${previewPos}px`;
+    }
+
+    // Can't use 100% width, in case the video is a different aspect ratio to the video container
+    setScrubbingContainerSize() {
+        const { width, height } = fitRatio(this.thumbAspectRatio, {
+            width: this.player.media.clientWidth,
+            height: this.player.media.clientHeight,
+        });
+        this.elements.scrubbing.container.style.width = `${width}px`;
+        this.elements.scrubbing.container.style.height = `${height}px`;
+    }
+
+    // Sprites need to be offset to the correct location
+    setImageSizeAndOffset(previewImage, frame) {
+        if (!this.usingSprites) {
+            return;
+        }
+
+        // Find difference between height and preview container height
+        const multiplier = this.thumbContainerHeight / frame.h;
+
+        // eslint-disable-next-line no-param-reassign
+        previewImage.style.height = `${previewImage.naturalHeight * multiplier}px`;
+        // eslint-disable-next-line no-param-reassign
+        previewImage.style.width = `${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`;
+    }
+}
+
+export default PreviewThumbnails;

src/js/plugins/vimeo.js

@@ -9,8 +9,10 @@ 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';
 import { buildUrlParams } from '../utils/urls';
 
 // Parse Vimeo ID from URL
@@ -27,13 +29,6 @@ function parseId(url) {
     return url.match(regex) ? RegExp.$2 : url;
 }
 
-// Get aspect ratio for dimensions
-function getAspectRatio(width, height) {
-    const getRatio = (w, h) => (h === 0 ? w : getRatio(h, w % h));
-    const ratio = getRatio(width, height);
-    return `${width / ratio}:${height / ratio}`;
-}
-
 // Set playback state and trigger change (only on actual change)
 function assurePlaybackState(play) {
     if (play && !this.embed.hasPlayed) {
@@ -47,59 +42,50 @@ function assurePlaybackState(play) {
 
 const vimeo = {
     setup() {
+        const player = this;
+
         // Add embed class for responsive
-        toggleClass(this.elements.wrapper, this.config.classNames.embed, true);
+        toggleClass(player.elements.wrapper, player.config.classNames.embed, true);
+
+        // Set speed options from config
+        player.options.speed = player.config.speed.options;
 
         // Set intial ratio
-        vimeo.setAspectRatio.call(this);
+        setAspectRatio.call(player);
 
-        // Load the API if not already
+        // Load the SDK if not already
         if (!is.object(window.Vimeo)) {
-            loadScript(this.config.urls.vimeo.sdk)
+            loadScript(player.config.urls.vimeo.sdk)
                 .then(() => {
-                    vimeo.ready.call(this);
+                    vimeo.ready.call(player);
                 })
                 .catch(error => {
-                    this.debug.warn('Vimeo API failed to load', error);
+                    player.debug.warn('Vimeo SDK (player.js) failed to load', error);
                 });
         } else {
-            vimeo.ready.call(this);
-        }
-    },
-
-    // Set aspect ratio
-    // For Vimeo we have an extra 300% height <div> to hide the standard controls and UI
-    setAspectRatio(input) {
-        const [x, y] = (is.string(input) ? input : this.config.ratio).split(':');
-        const padding = 100 / x * y;
-        this.elements.wrapper.style.paddingBottom = `${padding}%`;
-
-        if (this.supported.ui) {
-            const height = 240;
-            const offset = (height - padding) / (height / 50);
-
-            this.media.style.transform = `translateY(-${offset}%)`;
+            vimeo.ready.call(player);
         }
     },
 
     // API Ready
     ready() {
         const player = this;
+        const config = player.config.vimeo;
 
         // Get Vimeo params for the iframe
-        const options = {
-            loop: player.config.loop.active,
-            autoplay: player.autoplay,
-            // muted: player.muted,
-            byline: false,
-            portrait: false,
-            title: false,
-            speed: true,
-            transparent: 0,
-            gesture: 'media',
-            playsinline: !this.config.fullscreen.iosNative,
-        };
-        const params = buildUrlParams(options);
+        const params = buildUrlParams(
+            extend(
+                {},
+                {
+                    loop: player.config.loop.active,
+                    autoplay: player.autoplay,
+                    muted: player.muted,
+                    gesture: 'media',
+                    playsinline: !this.config.fullscreen.iosNative,
+                },
+                config,
+            ),
+        );
 
         // Get the source URL or ID
         let source = player.media.getAttribute('src');
@@ -110,7 +96,6 @@ const vimeo = {
         }
 
         const id = parseId(source);
-
         // Build an iframe
         const iframe = createElement('iframe');
         const src = format(player.config.urls.vimeo.iframe, id, params);
@@ -119,9 +104,13 @@ const vimeo = {
         iframe.setAttribute('allowtransparency', '');
         iframe.setAttribute('allow', 'autoplay');
 
+        // Set the referrer policy if required
+        if (!is.empty(config.referrerPolicy)) {
+            iframe.setAttribute('referrerPolicy', config.referrerPolicy);
+        }
+
         // Get poster, if already set
         const { poster } = player;
-
         // Inject the package
         const wrapper = createElement('div', { poster, class: player.config.classNames.embedContainer });
         wrapper.appendChild(iframe);
@@ -212,18 +201,10 @@ const vimeo = {
                 return speed;
             },
             set(input) {
-                player.embed
-                    .setPlaybackRate(input)
-                    .then(() => {
-                        speed = input;
-                        triggerEvent.call(player, player.media, 'ratechange');
-                    })
-                    .catch(error => {
-                        // Hide menu item (and menu if empty)
-                        if (error.name === 'Error') {
-                            controls.setSpeedMenu.call(player, []);
-                        }
-                    });
+                player.embed.setPlaybackRate(input).then(() => {
+                    speed = input;
+                    triggerEvent.call(player, player.media, 'ratechange');
+                });
             },
         });
 
@@ -278,6 +259,7 @@ const vimeo = {
             .getVideoUrl()
             .then(value => {
                 currentSrc = value;
+                controls.setDownloadUrl.call(player);
             })
             .catch(error => {
                 this.debug.warn(error);
@@ -298,8 +280,9 @@ const vimeo = {
 
         // Set aspect ratio based on video size
         Promise.all([player.embed.getVideoWidth(), player.embed.getVideoHeight()]).then(dimensions => {
-            const ratio = getAspectRatio(dimensions[0], dimensions[1]);
-            vimeo.setAspectRatio.call(this, ratio);
+            const [width, height] = dimensions;
+            player.embed.ratio = [width, height];
+            setAspectRatio.call(this);
         });
 
         // Set autopause
@@ -354,6 +337,14 @@ const vimeo = {
             }
         });
 
+        player.embed.on('bufferstart', () => {
+            triggerEvent.call(player, player.media, 'waiting');
+        });
+
+        player.embed.on('bufferend', () => {
+            triggerEvent.call(player, player.media, 'playing');
+        });
+
         player.embed.on('play', () => {
             assurePlaybackState.call(player, true);
             triggerEvent.call(player, player.media, 'playing');

src/js/plugins/youtube.js

@@ -7,9 +7,11 @@ 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 loadScript from '../utils/loadScript';
+import loadImage from '../utils/load-image';
+import loadScript from '../utils/load-script';
+import { extend } from '../utils/objects';
 import { format, generateId } from '../utils/strings';
+import { setAspectRatio } from '../utils/style';
 
 // Parse YouTube ID from URL
 function parseId(url) {
@@ -32,84 +34,78 @@ function assurePlaybackState(play) {
     }
 }
 
+function getHost(config) {
+    if (config.noCookie) {
+        return 'https://www.youtube-nocookie.com';
+    }
+
+    if (window.location.protocol === 'http:') {
+        return 'http://www.youtube.com';
+    }
+
+    // Use YouTube's default
+    return undefined;
+}
+
 const youtube = {
     setup() {
         // Add embed class for responsive
         toggleClass(this.elements.wrapper, this.config.classNames.embed, true);
 
-        // Set aspect ratio
-        youtube.setAspectRatio.call(this);
-
         // Setup API
         if (is.object(window.YT) && is.function(window.YT.Player)) {
             youtube.ready.call(this);
         } else {
-            // Load the API
-            loadScript(this.config.urls.youtube.sdk).catch(error => {
-                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);
-            });
+            // Reference current global callback
+            const callback = window.onYouTubeIframeAPIReady;
 
             // 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);
+            });
         }
     },
 
     // Get the media title
     getTitle(videoId) {
-        // Try via undocumented API method first
-        // This method disappears now and then though...
-        // https://github.com/sampotts/plyr/issues/709
-        if (is.function(this.embed.getVideoData)) {
-            const { title } = this.embed.getVideoData();
+        const url = format(this.config.urls.youtube.api, videoId);
 
-            if (is.empty(title)) {
-                this.config.title = title;
-                ui.setTitle.call(this);
-                return;
-            }
-        }
+        fetch(url)
+            .then(data => {
+                if (is.object(data)) {
+                    const { title, height, width } = data;
 
-        // Or via Google API
-        const key = this.config.keys.google;
-        if (is.string(key) && !is.empty(key)) {
-            const url = format(this.config.urls.youtube.api, videoId, key);
+                    // Set title
+                    this.config.title = title;
+                    ui.setTitle.call(this);
 
-            fetch(url)
-                .then(result => {
-                    if (is.object(result)) {
-                        this.config.title = result.items[0].snippet.title;
-                        ui.setTitle.call(this);
-                    }
-                })
-                .catch(() => {});
-        }
-    },
+                    // Set aspect ratio
+                    this.embed.ratio = [width, height];
+                }
 
-    // Set aspect ratio
-    setAspectRatio() {
-        const ratio = this.config.ratio.split(':');
-        this.elements.wrapper.style.paddingBottom = `${100 / ratio[0] * ratio[1]}%`;
+                setAspectRatio.call(this);
+            })
+            .catch(() => {
+                // Set aspect ratio
+                setAspectRatio.call(this);
+            });
     },
 
     // 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,53 +121,51 @@ 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://img.youtube.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';
                 }
             })
             .catch(() => {});
 
+        const config = player.config.youtube;
+
         // Setup instance
         // https://developers.google.com/youtube/iframe_api_reference
         player.embed = new window.YT.Player(id, {
             videoId,
-            playerVars: {
-                autoplay: player.config.autoplay ? 1 : 0, // Autoplay
-                hl: player.config.hl, // iframe interface language
-                controls: player.supported.ui ? 0 : 1, // Only show controls if not fully supported
-                rel: 0, // No related vids
-                showinfo: 0, // Hide info
-                iv_load_policy: 3, // Hide annotations
-                modestbranding: 1, // Hide logos as much as possible (they still show one in the corner when paused)
-                disablekb: 1, // Disable keyboard as we handle it
-                playsinline: 1, // Allow iOS inline playback
-
-                // Tracking for stats
-                // origin: window ? `${window.location.protocol}//${window.location.host}` : null,
-                widget_referrer: window ? window.location.href : null,
-
-                // Captions are flaky on YouTube
-                cc_load_policy: player.captions.active ? 1 : 0,
-                cc_lang_pref: player.config.captions.language,
-            },
+            host: getHost(config),
+            playerVars: extend(
+                {},
+                {
+                    autoplay: player.config.autoplay ? 1 : 0, // Autoplay
+                    hl: player.config.hl, // iframe interface language
+                    controls: player.supported.ui ? 0 : 1, // Only show controls if not fully supported
+                    disablekb: 1, // Disable keyboard as we handle it
+                    playsinline: !player.config.fullscreen.iosNative ? 1 : 0, // Allow iOS inline playback
+                    // Captions are flaky on YouTube
+                    cc_load_policy: player.captions.active ? 1 : 0,
+                    cc_lang_pref: player.config.captions.language,
+                    // Tracking for stats
+                    widget_referrer: window ? window.location.href : null,
+                },
+                config,
+            ),
             events: {
                 onError(event) {
                     // YouTube may fire onError twice, so only handle it once
@@ -303,7 +297,9 @@ const youtube = {
                     });
 
                     // Get available speeds
-                    player.options.speed = instance.getAvailablePlaybackRates();
+                    const speeds = instance.getAvailablePlaybackRates();
+                    // Filter based on config
+                    player.options.speed = speeds.filter(s => player.config.speed.options.includes(s));
 
                     // Set the tabindex to avoid focus entering iframe
                     if (player.supported.ui) {
@@ -390,7 +386,7 @@ const youtube = {
 
                         case 1:
                             // Restore paused state (YouTube starts playing on seek if the video hasn't been played yet)
-                            if (player.media.paused && !player.embed.hasPlayed) {
+                            if (!player.config.autoplay && player.media.paused && !player.embed.hasPlayed) {
                                 player.media.pause();
                             } else {
                                 assurePlaybackState.call(player, true);
@@ -422,6 +418,12 @@ const youtube = {
 
                             break;
 
+                        case 3:
+                            // Trigger waiting event to add loading classes to container as the video buffers.
+                            triggerEvent.call(player, player.media, 'waiting');
+
+                            break;
+
                         default:
                             break;
                     }

src/js/plyr.d.ts

@@ -0,0 +1,595 @@
+// Type definitions for plyr 3.5
+// Project: https://plyr.io
+// Definitions by: ondratra <https://github.com/ondratra>
+// TypeScript Version: 3.0
+
+export = Plyr;
+export as namespace Plyr;
+
+declare class Plyr {
+    /**
+     * Setup a new instance
+     */
+    static setup(targets: NodeList | HTMLElement | HTMLElement[] | string, options?: Plyr.Options): Plyr[];
+
+    /**
+     * Check for support
+     * @param mediaType
+     * @param provider
+     * @param playsInline Whether the player has the playsinline attribute (only applicable to iOS 10+)
+     */
+    static supported(mediaType?: Plyr.MediaType, provider?: Plyr.Provider, playsInline?: boolean): Plyr.Support;
+
+    constructor(targets: NodeList | HTMLElement | HTMLElement[] | string, options?: Plyr.Options);
+
+    /**
+     * Indicates if the current player is HTML5.
+     */
+    readonly isHTML5: boolean;
+
+    /**
+     * Indicates if the current player is an embedded player.
+     */
+    readonly isEmbed: boolean;
+
+    /**
+     * Indicates if the current player is playing.
+     */
+    readonly playing: boolean;
+
+    /**
+     * Indicates if the current player is paused.
+     */
+    readonly paused: boolean;
+
+    /**
+     * Indicates if the current player is stopped.
+     */
+    readonly stopped: boolean;
+
+    /**
+     * Indicates if the current player has finished playback.
+     */
+    readonly ended: boolean;
+
+    /**
+     * Returns a float between 0 and 1 indicating how much of the media is buffered
+     */
+    readonly buffered: number;
+
+    /**
+     * Gets or sets the currentTime for the player. The setter accepts a float in seconds.
+     */
+    currentTime: number;
+
+    /**
+     * Indicates if the current player is seeking.
+     */
+    readonly seeking: boolean;
+
+    /**
+     * Returns the duration for the current media.
+     */
+    readonly duration: number;
+
+    /**
+     * Gets or sets the volume for the player. The setter accepts a float between 0 and 1.
+     */
+    volume: number;
+
+    /**
+     * Gets or sets the muted state of the player. The setter accepts a boolean.
+     */
+    muted: boolean;
+
+    /**
+     * Indicates if the current media has an audio track.
+     */
+    readonly hasAudio: boolean;
+
+    /**
+     * Gets or sets the speed for the player. The setter accepts a value in the options specified in your config. Generally the minimum should be 0.5.
+     */
+    speed: number;
+
+    /**
+     * Gets or sets the quality for the player. The setter accepts a value from the options specified in your config.
+     * Remarks: YouTube only. HTML5 will follow.
+     */
+    quality: string;
+
+    /**
+     * Gets or sets the current loop state of the player.
+     */
+    loop: boolean;
+
+    /**
+     * Gets or sets the current source for the player.
+     */
+    source: Plyr.SourceInfo;
+
+    /**
+     * Gets or sets the current poster image URL for the player.
+     */
+    poster: string;
+
+    /**
+     * Gets or sets the autoplay state of the player.
+     */
+    autoplay: boolean;
+
+    /**
+     * Gets or sets the caption track by index. 1 means the track is missing or captions is not active
+     */
+    currentTrack: number;
+
+    /**
+     * Gets or sets the preferred captions language for the player. The setter accepts an ISO twoletter language code. Support for the languages is dependent on the captions you include.
+     * If your captions don't have any language data, or if you have multiple tracks with the same language, you may want to use currentTrack instead.
+     */
+    language: string;
+
+    /**
+     * Gets or sets the picture-in-picture state of the player. This currently only supported on Safari 10+ on MacOS Sierra+ and iOS 10+.
+     */
+    pip: boolean;
+
+    readonly fullscreen: Plyr.FullscreenControl;
+
+    /**
+     * Start playback.
+     * For HTML5 players, play() will return a Promise in some browsers - WebKit and Mozilla according to MDN at time of writing.
+     */
+    play(): Promise<void> | void;
+
+    /**
+     * Pause playback.
+     */
+    pause(): void;
+
+    /**
+     * Toggle playback, if no parameters are passed, it will toggle based on current status.
+     */
+    togglePlay(toggle?: boolean): boolean;
+
+    /**
+     * Stop playback and reset to start.
+     */
+    stop(): void;
+
+    /**
+     * Restart playback.
+     */
+    restart(): void;
+
+    /**
+     * Rewind playback by the specified seek time. If no parameter is passed, the default seek time will be used.
+     */
+    rewind(seekTime?: number): void;
+
+    /**
+     * Fast forward by the specified seek time. If no parameter is passed, the default seek time will be used.
+     */
+    forward(seekTime?: number): void;
+
+    /**
+     * Increase volume by the specified step. If no parameter is passed, the default step will be used.
+     */
+    increaseVolume(step?: number): void;
+
+    /**
+     * Increase volume by the specified step. If no parameter is passed, the default step will be used.
+     */
+    decreaseVolume(step?: number): void;
+
+    /**
+     * Toggle captions display. If no parameter is passed, it will toggle based on current status.
+     */
+    toggleCaptions(toggle?: boolean): void;
+
+    /**
+     * Trigger the airplay dialog on supported devices.
+     */
+    airplay(): void;
+
+    /**
+     * Toggle the controls (video only). Takes optional truthy value to force it on/off.
+     */
+    toggleControls(toggle: boolean): void;
+
+    /**
+     * Add an event listener for the specified event.
+     */
+    on(
+        event: Plyr.StandardEvent | Plyr.Html5Event | Plyr.YoutubeEvent,
+        callback: (this: this, event: Plyr.PlyrEvent) => void,
+    ): void;
+
+    /**
+     * Add an event listener for the specified event once.
+     */
+    once(
+        event: Plyr.StandardEvent | Plyr.Html5Event | Plyr.YoutubeEvent,
+        callback: (this: this, event: Plyr.PlyrEvent) => void,
+    ): void;
+
+    /**
+     * Remove an event listener for the specified event.
+     */
+    off(
+        event: Plyr.StandardEvent | Plyr.Html5Event | Plyr.YoutubeEvent,
+        callback: (this: this, event: Plyr.PlyrEvent) => void,
+    ): void;
+
+    /**
+     * Check support for a mime type.
+     */
+    supports(type: string): boolean;
+
+    /**
+     * Destroy lib instance
+     */
+    destroy(): void;
+}
+
+declare namespace Plyr {
+    type MediaType = 'audio' | 'video';
+    type Provider = 'html5' | 'youtube' | 'vimeo';
+    type StandardEvent =
+        | 'progress'
+        | 'playing'
+        | 'play'
+        | 'pause'
+        | 'timeupdate'
+        | 'volumechange'
+        | 'seeking'
+        | 'seeked'
+        | 'ratechange'
+        | 'ended'
+        | 'enterfullscreen'
+        | 'exitfullscreen'
+        | 'captionsenabled'
+        | 'captionsdisabled'
+        | 'languagechange'
+        | 'controlshidden'
+        | 'controlsshown'
+        | 'ready';
+    type Html5Event =
+        | 'loadstart'
+        | 'loadeddata'
+        | 'loadedmetadata'
+        | 'canplay'
+        | 'canplaythrough'
+        | 'stalled'
+        | 'waiting'
+        | 'emptied'
+        | 'cuechange'
+        | 'error';
+    type YoutubeEvent = 'statechange' | 'qualitychange' | 'qualityrequested';
+
+    interface FullscreenControl {
+        /**
+         * Indicates if the current player is in fullscreen mode.
+         */
+        readonly active: boolean;
+
+        /**
+         * Indicates if the current player has fullscreen enabled.
+         */
+        readonly enabled: boolean;
+
+        /**
+         * Enter fullscreen. If fullscreen is not supported, a fallback ""full window/viewport"" is used instead.
+         */
+        enter(): void;
+
+        /**
+         * Exit fullscreen.
+         */
+        exit(): void;
+
+        /**
+         * Toggle fullscreen.
+         */
+        toggle(): void;
+    }
+
+    interface Options {
+        /**
+         * Completely disable Plyr. This would allow you to do a User Agent check or similar to programmatically enable or disable Plyr for a certain UA. Example below.
+         */
+        enabled?: boolean;
+
+        /**
+         * Display debugging information in the console
+         */
+        debug?: boolean;
+
+        /**
+         * If a function is passed, it is assumed your method will return either an element or HTML string for the controls. Three arguments will be passed to your function;
+         * id (the unique id for the player), seektime (the seektime step in seconds), and title (the media title). See controls.md for more info on how the html needs to be structured.
+         * Defaults to ['play-large', 'play', 'progress', 'current-time', 'mute', 'volume', 'captions', 'settings', 'pip', 'airplay', 'fullscreen']
+         */
+        controls?: string[] | ((id: string, seektime: number, title: string) => unknown) | Element;
+
+        /**
+         * If you're using the default controls are used then you can specify which settings to show in the menu
+         * Defaults to ['captions', 'quality', 'speed', 'loop']
+         */
+        settings?: string[];
+
+        /**
+         * Used for internationalization (i18n) of the text within the UI.
+         */
+        i18n?: any;
+
+        /**
+         * Load the SVG sprite specified as the iconUrl option (if a URL). If false, it is assumed you are handling sprite loading yourself.
+         */
+        loadSprite?: boolean;
+
+        /**
+         * Specify a URL or path to the SVG sprite. See the SVG section for more info.
+         */
+        iconUrl?: string;
+
+        /**
+         * Specify the id prefix for the icons used in the default controls (e.g. plyr-play would be plyr).
+         * This is to prevent clashes if you're using your own SVG sprite but with the default controls.
+         * Most people can ignore this option.
+         */
+        iconPrefix?: string;
+
+        /**
+         * Specify a URL or path to a blank video file used to properly cancel network requests.
+         */
+        blankUrl?: string;
+
+        /**
+         * Autoplay the media on load. This is generally advised against on UX grounds. It is also disabled by default in some browsers.
+         * If the autoplay attribute is present on a <video> or <audio> element, this will be automatically set to true.
+         */
+        autoplay?: boolean;
+
+        /**
+         * Only allow one player playing at once.
+         */
+        autopause?: boolean;
+
+        /**
+         * The time, in seconds, to seek when a user hits fast forward or rewind.
+         */
+        seekTime?: number;
+
+        /**
+         * A number, between 0 and 1, representing the initial volume of the player.
+         */
+        volume?: number;
+
+        /**
+         * Whether to start playback muted. If the muted attribute is present on a <video> or <audio> element, this will be automatically set to true.
+         */
+        muted?: boolean;
+
+        /**
+         * Click (or tap) of the video container will toggle play/pause.
+         */
+        clickToPlay?: boolean;
+
+        /**
+         * Disable right click menu on video to help as very primitive obfuscation to prevent downloads of content.
+         */
+        disableContextMenu?: boolean;
+
+        /**
+         * Hide video controls automatically after 2s of no mouse or focus movement, on control element blur (tab out), on playback start or entering fullscreen.
+         * As soon as the mouse is moved, a control element is focused or playback is paused, the controls reappear instantly.
+         */
+        hideControls?: boolean;
+
+        /**
+         * Reset the playback to the start once playback is complete.
+         */
+        resetOnEnd?: boolean;
+
+        /**
+         * Enable keyboard shortcuts for focused players only or globally
+         */
+        keyboard?: KeyboardOptions;
+
+        /**
+         * controls: Display control labels as tooltips on :hover & :focus (by default, the labels are screen reader only).
+         * seek: Display a seek tooltip to indicate on click where the media would seek to.
+         */
+        tooltips?: TooltipOptions;
+
+        /**
+         * Specify a custom duration for media.
+         */
+        duration?: number;
+
+        /**
+         * Displays the duration of the media on the metadataloaded event (on startup) in the current time display.
+         * This will only work if the preload attribute is not set to none (or is not set at all) and you choose not to display the duration (see controls option).
+         */
+        displayDuration?: boolean;
+
+        /**
+         * Display the current time as a countdown rather than an incremental counter.
+         */
+        invertTime?: boolean;
+
+        /**
+         * Allow users to click to toggle the above.
+         */
+        toggleInvert?: boolean;
+
+        /**
+         * Allows binding of event listeners to the controls before the default handlers. See the defaults.js for available listeners.
+         * If your handler prevents default on the event (event.preventDefault()), the default handler will not fire.
+         */
+        listeners?: { [key: string]: (error: PlyrEvent) => void };
+
+        /**
+         * active: Toggles if captions should be active by default. language: Sets the default language to load (if available). 'auto' uses the browser language.
+         * update: Listen to changes to tracks and update menu. This is needed for some streaming libraries, but can result in unselectable language options).
+         */
+        captions?: CaptionOptions;
+
+        /**
+         * enabled: Toggles whether fullscreen should be enabled. fallback: Allow fallback to a full-window solution.
+         * iosNative: whether to use native iOS fullscreen when entering fullscreen (no custom controls)
+         */
+        fullscreen?: FullScreenOptions;
+
+        /**
+         * The aspect ratio you want to use for embedded players.
+         */
+        ratio?: string;
+
+        /**
+         * enabled: Allow use of local storage to store user settings. key: The key name to use.
+         */
+        storage?: StorageOptions;
+
+        /**
+         * selected: The default speed for playback. options: The speed options to display in the UI. YouTube and Vimeo will ignore any options outside of the 0.5-2 range, so options outside of this range will be hidden automatically.
+         */
+        speed?: SpeedOptions;
+
+        /**
+         * Currently only supported by YouTube. default is the default quality level, determined by YouTube. options are the options to display.
+         */
+        quality?: QualityOptions;
+
+        /**
+         * active: Whether to loop the current video. If the loop attribute is present on a <video> or <audio> element,
+         * this will be automatically set to true This is an object to support future functionality.
+         */
+        loop?: LoopOptions;
+
+        /**
+         * enabled: Whether to enable vi.ai ads. publisherId: Your unique vi.ai publisher ID.
+         */
+        ads?: AdOptions;
+    }
+
+    interface QualityOptions {
+        default: string;
+        options: string[];
+    }
+
+    interface LoopOptions {
+        active: boolean;
+    }
+
+    interface AdOptions {
+        enabled: boolean;
+        publisherId: string;
+    }
+
+    interface SpeedOptions {
+        selected: number;
+        options: number[];
+    }
+
+    interface KeyboardOptions {
+        focused?: boolean;
+        global?: boolean;
+    }
+
+    interface TooltipOptions {
+        controls?: boolean;
+        seek?: boolean;
+    }
+
+    interface FullScreenOptions {
+        enabled?: boolean;
+        fallback?: boolean;
+        allowAudio?: boolean;
+    }
+
+    interface CaptionOptions {
+        active?: boolean;
+        language?: string;
+        update?: boolean;
+    }
+
+    interface StorageOptions {
+        enabled?: boolean;
+        key?: string;
+    }
+
+    interface SourceInfo {
+        /**
+         * Note: YouTube and Vimeo are currently not supported as audio sources.
+         */
+        type: MediaType;
+
+        /**
+         * Title of the new media. Used for the aria-label attribute on the play button, and outer container. YouTube and Vimeo are populated automatically.
+         */
+        title?: string;
+
+        /**
+         * This is an array of sources. For HTML5 media, the properties of this object are mapped directly to HTML attributes so more can be added to the object if required.
+         */
+        sources: Source[];
+
+        /**
+         * The URL for the poster image (HTML5 video only).
+         */
+        poster?: string;
+
+        /**
+         * An array of track objects. Each element in the array is mapped directly to a track element and any keys mapped directly to HTML attributes so as in the example above,
+         * it will render as <track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/example_captions_en.vtt" default> and similar for the French version.
+         * Booleans are converted to HTML5 value-less attributes.
+         */
+        tracks?: Track[];
+    }
+
+    interface Source {
+        /**
+         * The URL of the media file (or YouTube/Vimeo URL).
+         */
+        src: string;
+        /**
+         * The MIME type of the media file (if HTML5).
+         */
+        type?: string;
+        provider?: Provider;
+        size?: number;
+    }
+
+    type TrackKind = 'subtitles' | 'captions' | 'descriptions' | 'chapters' | 'metadata';
+    interface Track {
+        /**
+         * Indicates how the text track is meant to be used
+         */
+        kind: TrackKind;
+        /**
+         * Indicates a user-readable title for the track
+         */
+        label: string;
+        /**
+         * The language of the track text data. It must be a valid BCP 47 language tag. If the kind attribute is set to subtitles, then srclang must be defined.
+         */
+        srcLang?: string;
+        /**
+         * The URL of the track (.vtt file).
+         */
+        src: string;
+
+        default?: boolean;
+    }
+
+    interface PlyrEvent extends CustomEvent {
+        readonly detail: { readonly plyr: Plyr };
+    }
+
+    interface Support {
+        api: boolean;
+        ui: boolean;
+    }
+}

src/js/plyr.js

@@ -1,12 +1,13 @@
 // ==========================================================================
 // Plyr
-// plyr.js v3.4.2
+// plyr.js v3.5.9
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
 
 import captions from './captions';
 import defaults from './config/defaults';
+import { pip } from './config/states';
 import { getProviderByUrl, providers, types } from './config/types';
 import Console from './console';
 import controls from './controls';
@@ -14,6 +15,7 @@ import Fullscreen from './fullscreen';
 import Listeners from './listeners';
 import media from './media';
 import Ads from './plugins/ads';
+import PreviewThumbnails from './plugins/preview-thumbnails';
 import source from './source';
 import Storage from './storage';
 import support from './support';
@@ -22,8 +24,10 @@ 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';
 import { parseUrl } from './utils/urls';
 
 // Private properties
@@ -147,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;
@@ -186,7 +189,7 @@ class Plyr {
                         // YouTube requires the playsinline in the URL
                         if (this.isYouTube) {
                             this.config.playsinline = truthy.includes(url.searchParams.get('playsinline'));
-                            this.config.hl = url.searchParams.get('hl'); // TODO: Should this be setting language?
+                            this.config.youtube.hl = url.searchParams.get('hl'); // TODO: Should this be setting language?
                         } else {
                             this.config.playsinline = true;
                         }
@@ -261,7 +264,7 @@ class Plyr {
 
         // Wrap media
         if (!is.element(this.elements.container)) {
-            this.elements.container = createElement('div');
+            this.elements.container = createElement('div', { tabindex: 0 });
             wrap(this.media, this.elements.container);
         }
 
@@ -299,8 +302,16 @@ class Plyr {
         }
 
         // Autoplay if required
-        if (this.config.autoplay) {
-            this.play();
+        if (this.isHTML5 && this.config.autoplay) {
+            setTimeout(() => this.play(), 10);
+        }
+
+        // Seek time will be recorded (in listeners.js) so we can prevent hiding controls for a few seconds after seek
+        this.lastSeekTime = 0;
+
+        // Setup preview thumbnails if enabled
+        if (this.config.previewThumbnails.enabled) {
+            this.previewThumbnails = new PreviewThumbnails(this);
         }
     }
 
@@ -312,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;
     }
 
     /**
@@ -343,6 +354,11 @@ class Plyr {
             return null;
         }
 
+        // Intecept play with ads
+        if (this.ads && this.ads.enabled) {
+            this.ads.managerPromise.then(() => this.ads.play()).catch(() => this.media.play());
+        }
+
         // Return the promise (for HTML5)
         return this.media.play();
     }
@@ -352,10 +368,10 @@ class Plyr {
      */
     pause() {
         if (!this.playing || !is.function(this.media.pause)) {
-            return;
+            return null;
         }
 
-        this.media.pause();
+        return this.media.pause();
     }
 
     /**
@@ -388,17 +404,17 @@ class Plyr {
 
     /**
      * Toggle playback based on current status
-     * @param {boolean} input
+     * @param {Boolean} input
      */
     togglePlay(input) {
         // Toggle based on current state if nothing passed
         const toggle = is.boolean(input) ? input : !this.playing;
 
         if (toggle) {
-            this.play();
-        } else {
-            this.pause();
+            return this.play();
         }
+
+        return this.pause();
     }
 
     /**
@@ -422,23 +438,23 @@ class Plyr {
 
     /**
      * Rewind
-     * @param {number} seekTime - how far to rewind in seconds. Defaults to the config.seekTime
+     * @param {Number} seekTime - how far to rewind in seconds. Defaults to the config.seekTime
      */
     rewind(seekTime) {
-        this.currentTime = this.currentTime - (is.number(seekTime) ? seekTime : this.config.seekTime);
+        this.currentTime -= is.number(seekTime) ? seekTime : this.config.seekTime;
     }
 
     /**
      * Fast forward
-     * @param {number} seekTime - how far to fast forward in seconds. Defaults to the config.seekTime
+     * @param {Number} seekTime - how far to fast forward in seconds. Defaults to the config.seekTime
      */
     forward(seekTime) {
-        this.currentTime = this.currentTime + (is.number(seekTime) ? seekTime : this.config.seekTime);
+        this.currentTime += is.number(seekTime) ? seekTime : this.config.seekTime;
     }
 
     /**
      * Seek to a time
-     * @param {number} input - where to seek to in seconds. Defaults to 0 (the start)
+     * @param {Number} input - where to seek to in seconds. Defaults to 0 (the start)
      */
     set currentTime(input) {
         // Bail if media duration isn't available yet
@@ -497,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;
@@ -508,7 +523,7 @@ class Plyr {
 
     /**
      * Set the player volume
-     * @param {number} value - must be between 0 and 1. Defaults to the value from local storage and config.volume if not set in storage
+     * @param {Number} value - must be between 0 and 1. Defaults to the value from local storage and config.volume if not set in storage
      */
     set volume(value) {
         let volume = value;
@@ -559,7 +574,7 @@ class Plyr {
 
     /**
      * Increase volume
-     * @param {boolean} step - How much to decrease by (between 0 and 1)
+     * @param {Boolean} step - How much to decrease by (between 0 and 1)
      */
     increaseVolume(step) {
         const volume = this.media.muted ? 0 : this.volume;
@@ -568,7 +583,7 @@ class Plyr {
 
     /**
      * Decrease volume
-     * @param {boolean} step - How much to decrease by (between 0 and 1)
+     * @param {Boolean} step - How much to decrease by (between 0 and 1)
      */
     decreaseVolume(step) {
         this.increaseVolume(-step);
@@ -576,7 +591,7 @@ class Plyr {
 
     /**
      * Set muted state
-     * @param {boolean} mute
+     * @param {Boolean} mute
      */
     set muted(mute) {
         let toggle = mute;
@@ -628,7 +643,7 @@ class Plyr {
 
     /**
      * Set playback speed
-     * @param {number} speed - the speed of playback (0.5-2.0)
+     * @param {Number} speed - the speed of playback (0.5-2.0)
      */
     set speed(input) {
         let speed = null;
@@ -645,24 +660,17 @@ class Plyr {
             speed = this.config.speed.selected;
         }
 
-        // Set min/max
-        if (speed < 0.1) {
-            speed = 0.1;
-        }
-        if (speed > 2.0) {
-            speed = 2.0;
-        }
-
-        if (!this.config.speed.options.includes(speed)) {
-            this.debug.warn(`Unsupported speed (${speed})`);
-            return;
-        }
+        // Clamp to min/max
+        const { minimumSpeed: min, maximumSpeed: max } = this;
+        speed = clamp(speed, min, max);
 
         // Update config
         this.config.speed.selected = speed;
 
         // Set media speed
-        this.media.playbackRate = speed;
+        setTimeout(() => {
+            this.media.playbackRate = speed;
+        }, 0);
     }
 
     /**
@@ -672,10 +680,46 @@ class Plyr {
         return Number(this.media.playbackRate);
     }
 
+    /**
+     * Get the minimum allowed speed
+     */
+    get minimumSpeed() {
+        if (this.isYouTube) {
+            // https://developers.google.com/youtube/iframe_api_reference#setPlaybackRate
+            return Math.min(...this.options.speed);
+        }
+
+        if (this.isVimeo) {
+            // https://github.com/vimeo/player.js/#setplaybackrateplaybackrate-number-promisenumber-rangeerrorerror
+            return 0.5;
+        }
+
+        // https://stackoverflow.com/a/32320020/1191319
+        return 0.0625;
+    }
+
+    /**
+     * Get the maximum allowed speed
+     */
+    get maximumSpeed() {
+        if (this.isYouTube) {
+            // https://developers.google.com/youtube/iframe_api_reference#setPlaybackRate
+            return Math.max(...this.options.speed);
+        }
+
+        if (this.isVimeo) {
+            // https://github.com/vimeo/player.js/#setplaybackrateplaybackrate-number-promisenumber-rangeerrorerror
+            return 2;
+        }
+
+        // https://stackoverflow.com/a/32320020/1191319
+        return 16;
+    }
+
     /**
      * Set playback quality
      * Currently HTML5 & YouTube only
-     * @param {number} input - Quality level
+     * @param {Number} input - Quality level
      */
     set quality(input) {
         const config = this.config.quality;
@@ -692,10 +736,15 @@ class Plyr {
             config.default,
         ].find(is.number);
 
+        let updateStorage = true;
+
         if (!options.includes(quality)) {
             const value = closest(options, quality);
             this.debug.warn(`Unsupported quality option: ${quality}, using ${value} instead`);
             quality = value;
+
+            // Don't update storage if quality is not supported
+            updateStorage = false;
         }
 
         // Update config
@@ -703,6 +752,11 @@ class Plyr {
 
         // Set quality
         this.media.quality = quality;
+
+        // Save to storage
+        if (updateStorage) {
+            this.storage.set({ quality });
+        }
     }
 
     /**
@@ -715,7 +769,7 @@ class Plyr {
     /**
      * Toggle loop
      * TODO: Finish fancy new logic. Set the indicator on load as user may pass loop as config
-     * @param {boolean} input - Whether to loop or not
+     * @param {Boolean} input - Whether to loop or not
      */
     set loop(input) {
         const toggle = is.boolean(input) ? input : this.config.loop.active;
@@ -775,7 +829,7 @@ class Plyr {
 
     /**
      * Set new media source
-     * @param {object} input - The new source object (see docs)
+     * @param {Object} input - The new source object (see docs)
      */
     set source(input) {
         source.change.call(this, input);
@@ -788,9 +842,31 @@ class Plyr {
         return this.media.currentSrc;
     }
 
+    /**
+     * Get a download URL (either source or custom)
+     */
+    get download() {
+        const { download } = this.config.urls;
+
+        return is.url(download) ? download : this.source;
+    }
+
+    /**
+     * Set the download URL
+     */
+    set download(input) {
+        if (!is.url(input)) {
+            return;
+        }
+
+        this.config.urls.download = input;
+
+        controls.setDownloadUrl.call(this);
+    }
+
     /**
      * Set the poster image for a video
-     * @param {input} - the URL for the new poster image
+     * @param {String} input - the URL for the new poster image
      */
     set poster(input) {
         if (!this.isVideo) {
@@ -812,9 +888,41 @@ class Plyr {
         return this.media.getAttribute('poster');
     }
 
+    /**
+     * Get the current aspect ratio in use
+     */
+    get ratio() {
+        if (!this.isVideo) {
+            return null;
+        }
+
+        const ratio = reduceAspectRatio(getAspectRatio.call(this));
+
+        return is.array(ratio) ? ratio.join(':') : ratio;
+    }
+
+    /**
+     * Set video aspect ratio
+     */
+    set ratio(input) {
+        if (!this.isVideo) {
+            this.debug.warn('Aspect ratio can only be set for video');
+            return;
+        }
+
+        if (!is.string(input) || !validateRatio(input)) {
+            this.debug.error(`Invalid aspect ratio specified (${input})`);
+            return;
+        }
+
+        this.config.ratio = input;
+
+        setAspectRatio.call(this);
+    }
+
     /**
      * Set the autoplay state
-     * @param {boolean} input - Whether to autoplay or not
+     * @param {Boolean} input - Whether to autoplay or not
      */
     set autoplay(input) {
         const toggle = is.boolean(input) ? input : this.config.autoplay;
@@ -830,7 +938,7 @@ class Plyr {
 
     /**
      * Toggle captions
-     * @param {boolean} input - Whether to enable captions
+     * @param {Boolean} input - Whether to enable captions
      */
     toggleCaptions(input) {
         captions.toggle.call(this, input, false);
@@ -838,7 +946,7 @@ class Plyr {
 
     /**
      * Set the caption track by index
-     * @param {number} - Caption index
+     * @param {Number} - Caption index
      */
     set currentTrack(input) {
         captions.set.call(this, input, false);
@@ -855,7 +963,7 @@ class Plyr {
     /**
      * Set the wanted language for captions
      * Since tracks can be added later it won't update the actual caption track until there is a matching track
-     * @param {string} - Two character ISO language code (e.g. EN, FR, PT, etc)
+     * @param {String} - Two character ISO language code (e.g. EN, FR, PT, etc)
      */
     set language(input) {
         captions.setLanguage.call(this, input, false);
@@ -874,21 +982,28 @@ class Plyr {
      * TODO: detect outside changes
      */
     set pip(input) {
-        const states = {
-            pip: 'picture-in-picture',
-            inline: 'inline',
-        };
-
         // Bail if no support
         if (!support.pip) {
             return;
         }
 
         // Toggle based on current state if not passed
-        const toggle = is.boolean(input) ? input : this.pip === states.inline;
+        const toggle = is.boolean(input) ? input : !this.pip;
 
         // Toggle based on current state
-        this.media.webkitSetPresentationMode(toggle ? states.pip : states.inline);
+        // Safari
+        if (is.function(this.media.webkitSetPresentationMode)) {
+            this.media.webkitSetPresentationMode(toggle ? pip.active : pip.inactive);
+        }
+
+        // Chrome
+        if (is.function(this.media.requestPictureInPicture)) {
+            if (!this.pip && toggle) {
+                this.media.requestPictureInPicture();
+            } else if (this.pip && !toggle) {
+                document.exitPictureInPicture();
+            }
+        }
     }
 
     /**
@@ -899,7 +1014,13 @@ class Plyr {
             return null;
         }
 
-        return this.media.webkitPresentationMode;
+        // Safari
+        if (!is.empty(this.media.webkitPresentationMode)) {
+            return this.media.webkitPresentationMode === pip.active;
+        }
+
+        // Chrome
+        return this.media === document.pictureInPictureElement;
     }
 
     /**
@@ -915,17 +1036,15 @@ class Plyr {
 
     /**
      * Toggle the player controls
-     * @param {boolean} [toggle] - Whether to show the controls
+     * @param {Boolean} [toggle] - Whether to show the controls
      */
     toggleControls(toggle) {
         // Don't toggle if missing UI support or if it's audio
         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);
 
@@ -948,8 +1067,8 @@ class Plyr {
 
     /**
      * Add event listeners
-     * @param {string} event - Event type
-     * @param {function} callback - Callback for when event occurs
+     * @param {String} event - Event type
+     * @param {Function} callback - Callback for when event occurs
      */
     on(event, callback) {
         on.call(this, this.elements.container, event, callback);
@@ -957,8 +1076,8 @@ class Plyr {
 
     /**
      * Add event listeners once
-     * @param {string} event - Event type
-     * @param {function} callback - Callback for when event occurs
+     * @param {String} event - Event type
+     * @param {Function} callback - Callback for when event occurs
      */
     once(event, callback) {
         once.call(this, this.elements.container, event, callback);
@@ -966,8 +1085,8 @@ class Plyr {
 
     /**
      * Remove event listeners
-     * @param {string} event - Event type
-     * @param {function} callback - Callback for when event occurs
+     * @param {String} event - Event type
+     * @param {Function} callback - Callback for when event occurs
      */
     off(event, callback) {
         off(this.elements.container, event, callback);
@@ -977,8 +1096,8 @@ class Plyr {
      * Destroy an instance
      * Event listeners are removed when elements are removed
      * http://stackoverflow.com/questions/12528049/if-a-dom-element-is-removed-are-its-listeners-also-removed-from-memory
-     * @param {function} callback - Callback for when destroy is complete
-     * @param {boolean} soft - Whether it's a soft destroy (for source changes etc)
+     * @param {Function} callback - Callback for when destroy is complete
+     * @param {Boolean} soft - Whether it's a soft destroy (for source changes etc)
      */
     destroy(callback, soft = false) {
         if (!this.ready) {
@@ -1041,11 +1160,13 @@ class Plyr {
         // Stop playback
         this.stop();
 
+        // Clear timeouts
+        clearTimeout(this.timers.loading);
+        clearTimeout(this.timers.controls);
+        clearTimeout(this.timers.resized);
+
         // Provider specific stuff
         if (this.isHTML5) {
-            // Clear timeout
-            clearTimeout(this.timers.loading);
-
             // Restore native video controls
             ui.toggleNativeControls.call(this, true);
 
@@ -1077,7 +1198,7 @@ class Plyr {
 
     /**
      * Check for support for a mime type (HTML5 only)
-     * @param {string} type - Mime type
+     * @param {String} type - Mime type
      */
     supports(type) {
         return support.mime.call(this, type);
@@ -1085,9 +1206,9 @@ class Plyr {
 
     /**
      * Check for support
-     * @param {string} type - Player type (audio/video)
-     * @param {string} provider - Provider (html5/youtube/vimeo)
-     * @param {bool} inline - Where player has `playsinline` sttribute
+     * @param {String} type - Player type (audio/video)
+     * @param {String} provider - Provider (html5/youtube/vimeo)
+     * @param {Boolean} inline - Where player has `playsinline` sttribute
      */
     static supported(type, provider, inline) {
         return support.check(type, provider, inline);
@@ -1095,8 +1216,8 @@ class Plyr {
 
     /**
      * Load an SVG sprite into the page
-     * @param {string} url - URL for the SVG sprite
-     * @param {string} [id] - Unique ID
+     * @param {String} url - URL for the SVG sprite
+     * @param {String} [id] - Unique ID
      */
     static loadSprite(url, id) {
         return loadSprite(url, id);
@@ -1105,7 +1226,7 @@ class Plyr {
     /**
      * Setup multiple instances
      * @param {*} selector
-     * @param {object} options
+     * @param {Object} options
      */
     static setup(selector, options = {}) {
         let targets = null;

src/js/plyr.polyfilled.js

@@ -1,13 +1,13 @@
 // ==========================================================================
 // Plyr Polyfilled Build
-// plyr.js v3.4.2
+// plyr.js v3.5.9
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
 
-import 'babel-polyfill';
 import 'custom-event-polyfill';
 import 'url-polyfill';
+
 import Plyr from './plyr';
 
 export default Plyr;

src/js/source.js

@@ -5,6 +5,7 @@
 import { providers } from './config/types';
 import html5 from './html5';
 import media from './media';
+import PreviewThumbnails from './plugins/preview-thumbnails';
 import support from './support';
 import ui from './ui';
 import { createElement, insertElement, removeElement } from './utils/elements';
@@ -114,12 +115,9 @@ const source = {
                 // HTML5 stuff
                 if (this.isHTML5) {
                     // Setup captions
-                    if ('tracks' in input) {
+                    if (Object.keys(input).includes('tracks')) {
                         source.insertElements.call(this, 'track', input.tracks);
                     }
-
-                    // Load HTML5 sources
-                    this.media.load();
                 }
 
                 // If HTML5 or embed but not fully supported, setupInterface and call ready now
@@ -128,6 +126,27 @@ const source = {
                     ui.build.call(this);
                 }
 
+                // Load HTML5 sources
+                if (this.isHTML5) {
+                    this.media.load();
+                }
+
+                // Update previewThumbnails config & reload plugin
+                if (!is.empty(input.previewThumbnails)) {
+                    Object.assign(this.config.previewThumbnails, input.previewThumbnails);
+
+                    // Cleanup previewThumbnails plugin if it was loaded
+                    if (this.previewThumbnails && this.previewThumbnails.loaded) {
+                        this.previewThumbnails.destroy();
+                        this.previewThumbnails = null;
+                    }
+
+                    // Create new instance if it is still enabled
+                    if (this.config.previewThumbnails.enabled) {
+                        this.previewThumbnails = new PreviewThumbnails(this);
+                    }
+                }
+
                 // Update the fullscreen support
                 this.fullscreen.update();
             },

src/js/support.js

@@ -36,8 +36,26 @@ const support = {
     },
 
     // Picture-in-picture support
-    // Safari only currently
-    pip: (() => !browser.isIPhone && is.function(createElement('video').webkitSetPresentationMode))(),
+    // Safari & Chrome only currently
+    pip: (() => {
+        if (browser.isIPhone) {
+            return false;
+        }
+
+        // Safari
+        // https://developer.apple.com/documentation/webkitjs/adding_picture_in_picture_to_your_safari_media_controls
+        if (is.function(createElement('video').webkitSetPresentationMode)) {
+            return true;
+        }
+
+        // Chrome
+        // https://developers.google.com/web/updates/2018/10/watch-video-using-picture-in-picture
+        if (document.pictureInPictureEnabled && !createElement('video').disablePictureInPicture) {
+            return true;
+        }
+
+        return false;
+    })(),
 
     // Airplay support
     // Safari only currently
@@ -50,27 +68,27 @@ const support = {
     // Check for mime type support against a player instance
     // Credits: http://diveintohtml5.info/everything.html
     // Related: http://www.leanbackplayer.com/test/h5mt.html
-    mime(inputType) {
-        const [mediaType] = inputType.split('/');
+    mime(input) {
+        if (is.empty(input)) {
+            return false;
+        }
+
+        const [mediaType] = input.split('/');
+        let type = input;
+
+        // Verify we're using HTML5 and there's no media type mismatch
         if (!this.isHTML5 || mediaType !== this.type) {
             return false;
         }
 
-        let type;
-        if (inputType && inputType.includes('codecs=')) {
-            // Use input directly
-            type = inputType;
-        } else if (inputType === 'audio/mpeg') {
-            // Skip codec
-            type = 'audio/mpeg;';
-        } else if (inputType in defaultCodecs) {
-            // Use codec
-            type = `${inputType}; codecs="${defaultCodecs[inputType]}"`;
+        // Add codec if required
+        if (Object.keys(defaultCodecs).includes(type)) {
+            type += `; codecs="${defaultCodecs[input]}"`;
         }
 
         try {
             return Boolean(type && this.media.canPlayType(type).replace(/no/, ''));
-        } catch (err) {
+        } catch (e) {
             return false;
         }
     },

src/js/ui.js

@@ -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() {
@@ -67,15 +67,15 @@ const ui = {
         // Reset mute state
         this.muted = null;
 
-        // Reset speed
-        this.speed = null;
-
         // Reset loop state
         this.loop = null;
 
         // Reset quality setting
         this.quality = null;
 
+        // Reset speed
+        this.speed = null;
+
         // Reset volume display
         controls.updateVolume.call(this);
 
@@ -172,6 +172,11 @@ const ui = {
         // Set property synchronously to respect the call order
         this.media.setAttribute('poster', poster);
 
+        // HTML5 uses native poster attribute
+        if (this.isHTML5) {
+            return Promise.resolve(poster);
+        }
+
         // Wait until ui is ready
         return (
             ready
@@ -198,7 +203,9 @@ const ui = {
                         // Reset backgroundSize as well (since it can be set to "cover" for padded thumbnails for youtube)
                         backgroundSize: '',
                     });
+
                     ui.togglePoster.call(this, true);
+
                     return poster;
                 })
         );
@@ -213,7 +220,8 @@ const ui = {
 
         // Set state
         Array.from(this.elements.buttons.play || []).forEach(target => {
-            target.pressed = this.playing;
+            Object.assign(target, { pressed: this.playing });
+            target.setAttribute('aria-label', i18n.get(this.playing ? 'pause' : 'play', this.config));
         });
 
         // Only update controls on non timeupdate events
@@ -233,22 +241,37 @@ const ui = {
         clearTimeout(this.timers.loading);
 
         // Timer to prevent flicker when seeking
-        this.timers.loading = setTimeout(() => {
-            // Update progress bar loading class state
-            toggleClass(this.elements.container, this.config.classNames.loading, this.loading);
+        this.timers.loading = setTimeout(
+            () => {
+                // Update progress bar loading class state
+                toggleClass(this.elements.container, this.config.classNames.loading, this.loading);
 
-            // Update controls visibility
-            ui.toggleControls.call(this);
-        }, this.loading ? 250 : 0);
+                // Update controls visibility
+                ui.toggleControls.call(this);
+            },
+            this.loading ? 250 : 0,
+        );
     },
 
     // Toggle controls based on state and `force` argument
     toggleControls(force) {
-        const { controls } = this.elements;
+        const { controls: controlsElement } = this.elements;
 
-        if (controls && this.config.hideControls) {
-            // Show controls if force, loading, paused, or button interaction, otherwise hide
-            this.toggleControls(Boolean(force || this.loading || this.paused || controls.pressed || controls.hover));
+        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 ||
+                        controlsElement.pressed ||
+                        controlsElement.hover ||
+                        recentTouchSeek,
+                ),
+            );
         }
     },
 };

src/js/utils/animation.js

@@ -2,7 +2,6 @@
 // Animation utils
 // ==========================================================================
 
-import { toggleHidden } from './elements';
 import is from './is';
 
 export const transitionEndEvent = (() => {
@@ -15,22 +14,25 @@ export const transitionEndEvent = (() => {
         transition: 'transitionend',
     };
 
-    const type = Object.keys(events).find(
-        event => element.style[event] !== undefined,
-    );
+    const type = Object.keys(events).find(event => element.style[event] !== undefined);
 
     return is.string(type) ? events[type] : false;
 })();
 
 // Force repaint of element
-export function repaint(element) {
+export function repaint(element, delay) {
     setTimeout(() => {
         try {
-            toggleHidden(element, true);
-            element.offsetHeight; // eslint-disable-line
-            toggleHidden(element, false);
+            // 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
         }
-    }, 0);
+    }, delay);
 }

src/js/utils/browser.js

@@ -5,6 +5,7 @@
 
 const browser = {
     isIE: /* @cc_on!@ */ false || !!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),

src/js/utils/elements.js

@@ -2,8 +2,8 @@
 // Element utils
 // ==========================================================================
 
-import { toggleListener } from './events';
 import is from './is';
+import { extend } from './objects';
 
 // Wrap an element
 export function wrap(elements, wrapper) {
@@ -16,7 +16,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;
@@ -137,30 +136,28 @@ export function getAttributesFromSelector(sel, existingAttributes) {
     }
 
     const attributes = {};
-    const existing = existingAttributes;
+    const existing = extend({}, existingAttributes);
 
     sel.split(',').forEach(s => {
         // Remove whitespace
         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[0];
+        const [key] = parts;
         const value = parts.length > 1 ? parts[1].replace(/["']/g, '') : '';
-
         // Get the first character
         const start = selector.charAt(0);
 
         switch (start) {
             case '.':
                 // Add to existing classname
-                if (is.object(existing) && is.string(existing.class)) {
-                    existing.class += ` ${className}`;
+                if (is.string(existing.class)) {
+                    attributes.class = `${existing.class} ${className}`;
+                } else {
+                    attributes.class = className;
                 }
-
-                attributes.class = className;
                 break;
 
             case '#':
@@ -179,7 +176,7 @@ export function getAttributesFromSelector(sel, existingAttributes) {
         }
     });
 
-    return attributes;
+    return extend(existing, attributes);
 }
 
 // Toggle hidden
@@ -194,11 +191,8 @@ export function toggleHidden(element, hidden) {
         hide = !element.hidden;
     }
 
-    if (hide) {
-        element.setAttribute('hidden', '');
-    } else {
-        element.removeAttribute('hidden');
-    }
+    // eslint-disable-next-line no-param-reassign
+    element.hidden = hide;
 }
 
 // Mirror Element.classList.toggle, with IE compatibility for "force" argument
@@ -233,14 +227,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
@@ -253,39 +247,6 @@ export function getElement(selector) {
     return this.elements.container.querySelector(selector);
 }
 
-// Trap focus inside container
-export function trapFocus(element = null, toggle = false) {
-    if (!is.element(element)) {
-        return;
-    }
-
-    const focusable = getElements.call(this, 'button:not(:disabled), input:not(:disabled), [tabindex]');
-    const first = focusable[0];
-    const last = focusable[focusable.length - 1];
-
-    const trap = event => {
-        // Bail if not tab key or not fullscreen
-        if (event.key !== 'Tab' || event.keyCode !== 9) {
-            return;
-        }
-
-        // Get the current focused element
-        const focused = document.activeElement;
-
-        if (focused === last && !event.shiftKey) {
-            // Move focus to first element that can be tabbed if Shift isn't used
-            first.focus();
-            event.preventDefault();
-        } else if (focused === first && event.shiftKey) {
-            // Move focus to last element that can be tabbed if Shift is used
-            last.focus();
-            event.preventDefault();
-        }
-    };
-
-    toggleListener.call(this, this.elements.container, 'keydown', trap, toggle, false);
-}
-
 // Set focus and tab focus class
 export function setFocus(element = null, tabFocus = false) {
     if (!is.element(element)) {
@@ -293,7 +254,7 @@ export function setFocus(element = null, tabFocus = false) {
     }
 
     // Set regular focus
-    element.focus();
+    element.focus({ preventScroll: true });
 
     // If we want to mimic keyboard focus via tab
     if (tabFocus) {

src/js/utils/events.js

@@ -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;
@@ -73,10 +72,10 @@ export function off(element, events = '', callback, passive = true, capture = fa
 
 // Bind once-only event handler
 export function once(element, events = '', callback, passive = true, capture = false) {
-    function onceCallback(...args) {
+    const onceCallback = (...args) => {
         off(element, events, onceCallback, passive, capture);
         callback.apply(this, args);
-    }
+    };
 
     toggleListener.call(this, element, events, onceCallback, true, passive, capture);
 }
@@ -91,9 +90,7 @@ export function triggerEvent(element, type = '', bubbles = false, detail = {}) {
     // Create and dispatch the event
     const event = new CustomEvent(type, {
         bubbles,
-        detail: Object.assign({}, detail, {
-            plyr: this,
-        }),
+        detail: { ...detail, plyr: this,},
     });
 
     // Dispatch the event
@@ -114,7 +111,7 @@ export function unbindListeners() {
 
 // Run method when / if player is ready
 export function ready() {
-    return new Promise(
-        resolve => (this.ready ? setTimeout(resolve, 0) : on.call(this, this.elements.container, 'ready', resolve)),
+    return new Promise(resolve =>
+        this.ready ? setTimeout(resolve, 0) : on.call(this, this.elements.container, 'ready', resolve),
     ).then(() => {});
 }

src/js/utils/i18n.js

@@ -6,6 +6,15 @@ import is from './is';
 import { getDeep } from './objects';
 import { replaceAll } from './strings';
 
+// Skip i18n for abbreviations and brand names
+const resources = {
+    pip: 'PIP',
+    airplay: 'AirPlay',
+    html5: 'HTML5',
+    vimeo: 'Vimeo',
+    youtube: 'YouTube',
+};
+
 const i18n = {
     get(key = '', config = {}) {
         if (is.empty(key) || is.empty(config)) {
@@ -15,6 +24,10 @@ const i18n = {
         let string = getDeep(config.i18n, key);
 
         if (is.empty(string)) {
+            if (Object.keys(resources).includes(key)) {
+                return resources[key];
+            }
+
             return '';
         }
 
@@ -23,8 +36,8 @@ const i18n = {
             '{title}': config.title,
         };
 
-        Object.entries(replace).forEach(([key, value]) => {
-            string = replaceAll(string, key, value);
+        Object.entries(replace).forEach(([k, v]) => {
+            string = replaceAll(string, k, v);
         });
 
         return string;

src/js/utils/is.js

@@ -19,6 +19,7 @@ const isEvent = input => instanceOf(input, Event);
 const isKeyboardEvent = input => instanceOf(input, KeyboardEvent);
 const isCue = input => instanceOf(input, window.TextTrackCue) || instanceOf(input, window.VTTCue);
 const isTrack = input => instanceOf(input, TextTrack) || (!isNullOrUndefined(input) && isString(input.kind));
+const isPromise = input => instanceOf(input, Promise);
 
 const isEmpty = input =>
     isNullOrUndefined(input) ||
@@ -31,6 +32,11 @@ const isUrl = input => {
         return true;
     }
 
+    // Must be string from here
+    if (!isString(input)) {
+        return false;
+    }
+
     // Add the protocol if required
     let string = input;
     if (!input.startsWith('http://') || !input.startsWith('https://')) {
@@ -60,6 +66,7 @@ export default {
     keyboardEvent: isKeyboardEvent,
     cue: isCue,
     track: isTrack,
+    promise: isPromise,
     url: isUrl,
     empty: isEmpty,
 };

src/js/utils/load-sprite.js

@@ -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', '');

src/js/utils/numbers.js

@@ -0,0 +1,17 @@
+/**
+ * Returns a number whose value is limited to the given range.
+ *
+ * Example: limit the output of this computation to between 0 and 255
+ * (x * 255).clamp(0, 255)
+ *
+ * @param {Number} input
+ * @param {Number} min The lower boundary of the output range
+ * @param {Number} max The upper boundary of the output range
+ * @returns A number in the range [min, max]
+ * @type Number
+ */
+export function clamp(input = 0, min = 0, max = 255) {
+    return Math.min(Math.max(input, min), max);
+}
+
+export default { clamp };

src/js/utils/strings.js

@@ -24,7 +24,7 @@ export function getPercentage(current, max) {
         return 0;
     }
 
-    return (current / max * 100).toFixed(2);
+    return ((current / max) * 100).toFixed(2);
 }
 
 // Replace all occurances of a string in a string

src/js/utils/style.js

@@ -0,0 +1,78 @@
+// ==========================================================================
+// Style utils
+// ==========================================================================
+
+import is from './is';
+
+export function validateRatio(input) {
+    if (!is.array(input) && (!is.string(input) || !input.includes(':'))) {
+        return false;
+    }
+
+    const ratio = is.array(input) ? input : input.split(':');
+
+    return ratio.map(Number).every(is.number);
+}
+
+export function reduceAspectRatio(ratio) {
+    if (!is.array(ratio) || !ratio.every(is.number)) {
+        return null;
+    }
+
+    const [width, height] = ratio;
+    const getDivider = (w, h) => (h === 0 ? w : getDivider(h, w % h));
+    const divider = getDivider(width, height);
+
+    return [width / divider, height / divider];
+}
+
+export function getAspectRatio(input) {
+    const parse = ratio => (validateRatio(ratio) ? ratio.split(':').map(Number) : null);
+    // Try provided ratio
+    let ratio = parse(input);
+
+    // Get from config
+    if (ratio === null) {
+        ratio = parse(this.config.ratio);
+    }
+
+    // Get from embed
+    if (ratio === null && !is.empty(this.embed) && is.array(this.embed.ratio)) {
+        ({ ratio } = this.embed);
+    }
+
+    // Get from HTML5 video
+    if (ratio === null && this.isHTML5) {
+        const { videoWidth, videoHeight } = this.media;
+        ratio = reduceAspectRatio([videoWidth, videoHeight]);
+    }
+
+    return ratio;
+}
+
+// Set aspect ratio for responsive container
+export function setAspectRatio(input) {
+    if (!this.isVideo) {
+        return {};
+    }
+
+    const { wrapper } = this.elements;
+    const ratio = getAspectRatio.call(this, input);
+    const [w, h] = is.array(ratio) ? ratio : [0, 0];
+    const padding = (100 / w) * h;
+
+    wrapper.style.paddingBottom = `${padding}%`;
+
+    // For Vimeo we have an extra <div> to hide the standard controls and UI
+    if (this.isVimeo && this.supported.ui) {
+        const height = 240;
+        const offset = (height - padding) / (height / 50);
+        this.media.style.transform = `translateY(-${offset}%)`;
+    } else if (this.isHTML5) {
+        wrapper.classList.toggle(this.config.classNames.videoFixedRatio, ratio !== null);
+    }
+
+    return { padding, ratio };
+}
+
+export default { setAspectRatio };

src/js/utils/time.js

@@ -5,20 +5,19 @@
 import is from './is';
 
 // Time helpers
-export const getHours = value => parseInt((value / 60 / 60) % 60, 10);
-export const getMinutes = value => parseInt((value / 60) % 60, 10);
-export const getSeconds = value => parseInt(value % 60, 10);
+export const getHours = value => Math.trunc((value / 60 / 60) % 60, 10);
+export const getMinutes = value => Math.trunc((value / 60) % 60, 10);
+export const getSeconds = value => Math.trunc(value % 60, 10);
 
 // Format time to UI friendly string
 export function formatTime(time = 0, displayHours = false, inverted = false) {
     // Bail if the value isn't a number
     if (!is.number(time)) {
-        return formatTime(null, displayHours, inverted);
+        return formatTime(undefined, displayHours, inverted);
     }
 
     // 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);

src/js/utils/urls.js

@@ -6,8 +6,8 @@ import is from './is';
 
 /**
  * Parse a string to a URL object
- * @param {string} input - the URL to be parsed
- * @param {boolean} safe - failsafe parsing
+ * @param {String} input - the URL to be parsed
+ * @param {Boolean} safe - failsafe parsing
  */
 export function parseUrl(input, safe = true) {
     let url = input;

src/sass/base.scss

@@ -5,24 +5,28 @@
 // Base
 .plyr {
     @include plyr-font-smoothing($plyr-font-smoothing);
-
+    align-items: center;
     direction: ltr;
+    display: flex;
+    flex-direction: column;
     font-family: $plyr-font-family;
     font-variant-numeric: tabular-nums; // Force monosace-esque number widths
     font-weight: $plyr-font-weight-regular;
+    height: 100%;
     line-height: $plyr-line-height;
     max-width: 100%;
     min-width: 200px;
     position: relative;
     text-shadow: none;
     transition: box-shadow 0.3s ease;
+    z-index: 0; // Force any border radius
 
     // Media elements
     video,
-    audio {
-        border-radius: inherit;
-        height: auto;
-        vertical-align: middle;
+    audio,
+    iframe {
+        display: block;
+        height: 100%;
         width: 100%;
     }
 

src/sass/components/control.scss

@@ -33,6 +33,16 @@
     }
 }
 
+// Remove any link styling
+a.plyr__control {
+    text-decoration: none;
+
+    &::after,
+    &::before {
+        display: none;
+    }
+}
+
 // Change icons on state change
 .plyr__control:not(.plyr__control--pressed) .icon--pressed,
 .plyr__control.plyr__control--pressed .icon--not-pressed,
@@ -40,65 +50,3 @@
 .plyr__control.plyr__control--pressed .label--not-pressed {
     display: none;
 }
-
-// Audio control
-.plyr--audio .plyr__control {
-    &.plyr__tab-focus,
-    &:hover,
-    &[aria-expanded='true'] {
-        background: $plyr-audio-control-bg-hover;
-        color: $plyr-audio-control-color-hover;
-    }
-}
-
-// 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,
-    &[aria-expanded='true'] {
-        background: $plyr-video-control-bg-hover;
-        color: $plyr-video-control-color-hover;
-    }
-}
-
-// Large play button (video only)
-.plyr__control--overlaid {
-    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%;
-    padding: ceil($plyr-control-spacing * 1.5);
-    position: absolute;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    z-index: 2;
-
-    svg {
-        height: $plyr-control-icon-size-large;
-        left: 2px; // Offset to make the play button look right
-        position: relative;
-        width: $plyr-control-icon-size-large;
-    }
-
-    &:hover,
-    &:focus {
-        background: $plyr-video-control-bg-hover;
-    }
-}
-
-.plyr--playing .plyr__control--overlaid {
-    opacity: 0;
-    visibility: hidden;
-}
-
-.plyr--full-ui.plyr--video .plyr__control--overlaid {
-    display: block;
-}

src/sass/components/controls.scss

@@ -14,79 +14,39 @@
     justify-content: flex-end;
     text-align: center;
 
+    .plyr__progress__container {
+        flex: 1;
+        min-width: 0; // Fix for Edge issue where content would overflow
+    }
+
     // Spacing
-    > .plyr__control,
-    .plyr__progress,
-    .plyr__time,
-    .plyr__menu,
-    .plyr__volume {
-        margin-left: ($plyr-control-spacing / 2);
-    }
+    .plyr__controls__item {
+        margin-left: ($plyr-control-spacing / 4);
 
-    .plyr__menu + .plyr__control,
-    > .plyr__control + .plyr__menu,
-    > .plyr__control + .plyr__control,
-    .plyr__progress + .plyr__control {
-        margin-left: floor($plyr-control-spacing / 4);
-    }
+        &:first-child {
+            margin-left: 0;
+            margin-right: auto;
+        }
 
-    > .plyr__control:first-child,
-    > .plyr__control:first-child + [data-plyr='pause'] {
-        margin-left: 0;
-        margin-right: auto;
+        &.plyr__progress__container {
+            padding-left: ($plyr-control-spacing / 4);
+        }
+
+        &.plyr__time {
+            padding: 0 ($plyr-control-spacing / 2);
+        }
+
+        &.plyr__progress__container:first-child,
+        &.plyr__time:first-child,
+        &.plyr__time + .plyr__time {
+            padding-left: 0;
+        }
     }
 
     // Hide empty controls
     &:empty {
         display: none;
     }
-
-    @media (min-width: $plyr-bp-sm) {
-        > .plyr__control,
-        .plyr__menu,
-        .plyr__progress,
-        .plyr__time,
-        .plyr__volume {
-            margin-left: $plyr-control-spacing;
-        }
-    }
-}
-
-// Audio controls
-.plyr--audio .plyr__controls {
-    background: $plyr-audio-controls-bg;
-    border-radius: inherit;
-    color: $plyr-audio-control-color;
-    padding: $plyr-control-spacing;
-}
-
-// Video controls
-.plyr--video .plyr__controls {
-    background: linear-gradient(
-        rgba($plyr-video-controls-bg, 0),
-        rgba($plyr-video-controls-bg, 0.7)
-    );
-    border-bottom-left-radius: inherit;
-    border-bottom-right-radius: inherit;
-    bottom: 0;
-    color: $plyr-video-control-color;
-    left: 0;
-    padding: ($plyr-control-spacing * 2) ($plyr-control-spacing / 2) ($plyr-control-spacing / 2);
-    position: absolute;
-    right: 0;
-    transition: opacity 0.4s ease-in-out, transform 0.4s ease-in-out;
-    z-index: 3;
-
-    @media (min-width: $plyr-bp-sm) {
-        padding: ($plyr-control-spacing * 3.5) $plyr-control-spacing $plyr-control-spacing;
-    }
-}
-
-// Hide video controls
-.plyr--video.plyr--hide-controls .plyr__controls {
-    opacity: 0;
-    pointer-events: none;
-    transform: translateY(100%);
 }
 
 // Some options are hidden by default

src/sass/components/embed.scss

@@ -1,36 +0,0 @@
-// --------------------------------------------------------------
-// Embedded players
-// YouTube, Vimeo, etc
-// --------------------------------------------------------------
-
-// Default to 16:9 ratio but this is set by JavaScript based on config
-$embed-padding: ((100 / 16) * 9);
-
-.plyr__video-embed {
-    height: 0;
-    padding-bottom: to-percentage($embed-padding);
-    position: relative;
-
-    iframe {
-        border: 0;
-        height: 100%;
-        left: 0;
-        position: absolute;
-        top: 0;
-        user-select: none;
-        width: 100%;
-    }
-}
-
-// If the full custom UI is supported
-.plyr--full-ui .plyr__video-embed {
-    $height: 240;
-    $offset: to-percentage(($height - $embed-padding) / ($height / 50));
-
-    // Only used for Vimeo
-    > .plyr__video-embed__container {
-        padding-bottom: to-percentage($height);
-        position: relative;
-        transform: translateY(-$offset);
-    }
-}

src/sass/components/menus.scss

@@ -39,8 +39,7 @@
 
         > div {
             overflow: hidden;
-            transition: height 0.35s cubic-bezier(0.4, 0, 0.2, 1),
-                width 0.35s cubic-bezier(0.4, 0, 0.2, 1);
+            transition: height 0.35s cubic-bezier(0.4, 0, 0.2, 1), width 0.35s cubic-bezier(0.4, 0, 0.2, 1);
         }
 
         // Arrow
@@ -74,8 +73,7 @@
             color: $plyr-menu-color;
             display: flex;
             font-size: $plyr-font-size-menu;
-            padding: ceil($plyr-control-padding / 2)
-                ceil($plyr-control-padding * 1.5);
+            padding: ceil($plyr-control-padding / 2) ceil($plyr-control-padding * 1.5);
             user-select: none;
             width: 100%;
 

src/sass/components/progress.scss

@@ -2,18 +2,19 @@
 // Playback progress
 // --------------------------------------------------------------
 
+// Offset the range thumb in order to be able to calculate the relative progress (#954)
+$plyr-progress-offset: $plyr-range-thumb-height;
+
 .plyr__progress {
-    flex: 1;
-    left: $plyr-range-thumb-height / 2;
-    margin-right: $plyr-range-thumb-height;
+    left: $plyr-progress-offset / 2;
+    margin-right: $plyr-progress-offset;
     position: relative;
 
     input[type='range'],
     &__buffer {
-        margin-left: -($plyr-range-thumb-height / 2);
-        margin-right: -($plyr-range-thumb-height / 2);
-        // Offset the range thumb in order to be able to calculate the relative progress (#954)
-        width: calc(100% + #{$plyr-range-thumb-height});
+        margin-left: -($plyr-progress-offset / 2);
+        margin-right: -($plyr-progress-offset / 2);
+        width: calc(100% + #{$plyr-progress-offset});
     }
 
     input[type='range'] {
@@ -42,13 +43,13 @@
 
     &::-webkit-progress-bar {
         background: transparent;
-        transition: width 0.2s ease;
     }
 
     &::-webkit-progress-value {
         background: currentColor;
         border-radius: 100px;
         min-width: $plyr-range-track-height;
+        transition: width 0.2s ease;
     }
 
     // Mozilla
@@ -66,15 +67,6 @@
     }
 }
 
-.plyr--video .plyr__progress__buffer {
-    box-shadow: 0 1px 1px rgba(#000, 0.15);
-    color: $plyr-video-progress-buffered-bg;
-}
-
-.plyr--audio .plyr__progress__buffer {
-    color: $plyr-audio-progress-buffered-bg;
-}
-
 // Loading state
 .plyr--loading .plyr__progress__buffer {
     animation: plyr-progress 1s linear infinite;