v3.7.1

- Feat: Minor styling improvements to the preview thumbnails (🚨 Requires a SCSS/CSS update 🚨)
- Fix: fix invalid CSS @charset rule in Sass files (thanks @Hashen110!)
- Chore: Replace deprecated KeyboardEvent `keyCode` references to use `key` instead (thanks @Hashen110!)
- Various other code clean up and typo fixes (thanks @Hashen110!)

.nvmrc

@@ -1 +1 @@
-v12.8
+16

.stylelintrc.json

@@ -1,6 +1,7 @@
 {
-  "plugins": ["stylelint-selector-bem-pattern", "stylelint-scss"],
+  "plugins": ["stylelint-selector-bem-pattern"],
-  "extends": ["stylelint-config-recommended", "stylelint-config-sass-guidelines", "stylelint-config-prettier"],
+  "extends": ["stylelint-config-sass-guidelines", "stylelint-config-prettier"],
+  "customSyntax": "postcss-scss",
   "rules": {
     "selector-class-pattern": null,
     "selector-no-qualifying-type": [
@@ -9,10 +10,7 @@
         "ignore": ["attribute", "class"]
       }
     ],
-    "string-no-newline": null,
+    "max-nesting-depth": 4,
-    "indentation": 2,
-    "string-quotes": "single",
-    "max-nesting-depth": 2,
     "plugin/selector-bem-pattern": {
       "preset": "bem",
       "componentName": "(([a-z0-9]+(?!-$)-?)+)",

.travis.yml

@@ -1,6 +0,0 @@
-language: node_js
-node_js: lts/*
-
-script:
-- npm run lint
-- npm run build

CHANGELOG.md

@@ -1,3 +1,61 @@
+### v3.7.1
+
+- Feat: Minor styling improvements to the preview thumbnails (🚨 Requires a SCSS/CSS update 🚨)
+- Fix: fix invalid CSS @charset rule in Sass files (thanks @Hashen110!)
+- Chore: Replace deprecated KeyboardEvent `keyCode` references to use `key` instead (thanks @Hashen110!)
+- Various other code clean up and typo fixes (thanks @Hashen110!)
+
+## v3.7.0
+
+- Feat: Add markers support (🚨 Requires a SCSS/CSS update 🚨) (thanks @ForeverSc and @fengshuo!)
+- Feat: Add support for MediaMetadata (thanks @Hashen110!)
+- Fix: Pass this context to captions.setup (fixes #2352) (thanks @WilliamMHerring, @willherring and @zenyr!)
+- Fix: Modify vimeo parseHash to use non-named capture groups (fixes #2396) (thanks @fekle!)
+- Fix: Replace deprecated String.prototype.substr() (thanks @CommanderRoot!)
+- Docs: Update speed option default to match the source (thanks @ozgurg!)
+- Docs: SASS → Sass (thanks @toastal!)
+
+### v3.6.12
+
+- Fix: remove division logic from ads.scss (fixes #2370)
+
+### v3.6.11
+
+- Fix: Replace `list.slash` added in 3.6.10 with `calc`
+- Chore: Package upgrades
+- Chore: Sass clean up
+- Chore: Improvements to style linting
+
+### v3.6.10
+
+- Fix: Use `list.slash` instead of deprecated syntax
+- Chore: Clean up demo
+
+### v3.6.9
+
+- Fix: Sass issue with division (thanks @ROL4ND909 and @le0pard)
+- Fix: Captions when switching sources (thanks @zexingguo)
+- Fix: Icons loading within iframes (thanks @ajgagnon)
+- Chore: Update TypeScript types (thanks @Jackie1210 and @AntLevin)
+- Fix: iOS fullscreen centering (thanks @hemratna)
+- Feat: Added getter and setter for preview thumbnails (thanks @Benny739)
+- Fix: Change fullscreen element to player rootnode (thanks @Walter van den Houten)
+- Fix: Fixed errors when Plyr instance is destroyed before constructor setTimeout() functions execute (thanks @emilis-ideait)
+- Fix: Invalid CSS selector syntax (thanks @BjornBrandewallNaviga)
+- Fix: Video height issues
+- Feat: Improve support for Vimeo private videos (thanks @Frosch)
+- Fix: YouTube duration issues (thanks @liesahead)
+
+### v3.6.8
+
+- Typings: add FullscreenOptions.container to typing files (thanks @MeguminSama!)
+- Fix: added iPadOS detection to isIos util (thanks @Benny739!)
+- Fix: issues with Vimeo fullscreen
+
+### v3.6.7
+
+- Fix: remove regression caused by optional chaining and nullish coalescing in check for `window.CSS` check for aspect-ratio (fixes #2174)
+
 ### v3.6.6
 
 - Improvements to how aspect ratio is handled. Use `aspect-ratio` CSS property instead of the legacy method (still used as fallback). Also automatically determined aspect ratios are rounded to the nearast standard ratio. This fixes issues with the YouTube embeds showing a 1-2px black bar.
@@ -36,7 +94,7 @@
 - Fix "A `ReferenceError: _classCallCheck is not defined` error has occurred." error (thanks @hex-ci)
 - Fix issue with CSS custom property check (thanks @syedhusain-appspace)
 - Fix for slow loading videos not autoplaying (thanks @DanielHuntleySBG)
-- Fix for betwork requests are not cancelled after the player is destroyed (thanks @DanielHuntleySBG)
+- Fix for network requests are not cancelled after the player is destroyed (thanks @DanielHuntleySBG)
 - Added option to disable custom controls for YouTube and Vimeo
 
 ### v3.6.2
@@ -81,7 +139,7 @@
 ### v3.5.8
 
 - Added `flex-direction` property to fix some issues introduced in v3.5.7 when using custom CSS
-- Cleaned up the organisation of some of the SCSS files (should not effect CSS output)
+- Cleaned up the organization of some of the SCSS files (should not effect CSS output)
 - Added `referrerPolicy` option for Vimeo to prevent an issue present in the demo site
 - Remove all Vimeo controls for Pro & Premium accounts
 - Improve thumbnail size calculations when size is set per css (thanks @ydylla)
@@ -96,7 +154,7 @@
 - Accessibility tweak for the play button (thanks @lunika)
 - Fix for ads configuration (thanks @SoftCreatR)
 - Fix handling listener return value (thanks @taion)
-- Added localisation key for PIP (picture-in-picture) (thanks @lmislm)
+- Added localization key for PIP (picture-in-picture) (thanks @lmislm)
 - Preserve viewBox attribute in SVG sprite symbols (thanks @bseib)
 - Fix being unable to unmute autoplayed video on iOS (thanks @sumanbh)
 - Fixed Plyr container not resizing responsively (thanks @shravan2x)
@@ -130,7 +188,7 @@ _Note:_ This update contains CSS changes.
 ### v3.5.4
 
 - Added: Set download URL via new setter
-- Improvement: The order of the `controls` option now effects the order in the DOM - i.e. you can re-order the controls - Note: this may break any custom CSS you have setup. Please see the changes in the PR to the default SASS
+- Improvement: The order of the `controls` option now effects the order in the DOM - i.e. you can re-order the controls - Note: this may break any custom CSS you have setup. Please see the changes in the PR to the default Sass
 - Fixed issue with empty controls and preview thumbs
 - Fixed issue with setGutter call (from Sentry)
 - Fixed issue with initial selected speed not working
@@ -493,7 +551,7 @@ This is a massive release. A _mostly_ complete rewrite in ES6. What started out
 
 ### Other stuff
 
-- Now using SASS exclusively. Sorry, LESS folk it just made sense to maintain one method as SASS is what the cool kids use. It may come back if we work out an automated way to convert the SASS
+- Now using Sass exclusively. Sorry, LESS folk it just made sense to maintain one method as Sass is what the cool kids use. It may come back if we work out an automated way to convert the Sass
 - Moved to ES6. All the rage these days. You'll need to look at polyfills. The demo uses [polyfill.io](https://polyfill.io)
 - Added basic looping support
 - Added an aspect ratio option for those that can't leave the 90s and want 4:3
@@ -726,7 +784,7 @@ And some other changes and bug fixes:
 
 ## v1.7.0
 
-- SASS cleanup (fixes #265)
+- Sass cleanup (fixes #265)
 - Docs tidy up to help quick start (fixes #253)
 - Fix for issues with data attribute options passing (fixes #257)
 - **_(Important)_** Removed the requirement for a wrapper div to setup Plyr and removed the dependency on the `plyr` classname as a JS hook. By default it will now look for `<video>`, `<audio>` and `[data-type]` elements. If you are just calling `setup()` with a `<div class="plyr">` you may want to give it a good test after upgrading. You can probably remove the wrapper div. The reason behind this is to make setup easier for newcomers and prevent the styling being used on unsupported players (because the plyr classname was used as a CSS and JS hook - which isn't ideal)
@@ -848,7 +906,7 @@ And some other changes and bug fixes:
 ### v1.5.18
 
 - Added 'ready' event for initial setup complete or source change occurs
-- Fixed SASS stylesheet references to transparentize
+- Fixed Sass stylesheet references to transparentize
 - Added default font stack to controls
 - Docs fixes inc controls HTML (fixes #180)
 
@@ -885,7 +943,7 @@ And some other changes and bug fixes:
 
 - iOS embed bug fixes (fixes #166)
 - Hide IE/Edge <input type='range'> tooltip (since we have a styled one) (fixes #160)
-- SASS bug fix for default values (fixes #158)
+- Sass bug fix for default values (fixes #158)
 
 ### v1.5.9
 
@@ -907,7 +965,7 @@ And some other changes and bug fixes:
 ### v1.5.6
 
 - Seek tooltip (option for tooltips changed, please check docs)
-- SASS compile error fixes (fixes #148)
+- Sass compile error fixes (fixes #148)
 - Fullscreen fixes for controls not always hiding/showing (fixes #149)
 - Screen reader icon fixes (title was being read twice due to the tooltip/hidden label)
 
@@ -984,7 +1042,7 @@ And some other changes and bug fixes:
 
 ### v1.2.6
 
-- SASS updates and fixes (cheers @ChristianPV)
+- Sass updates and fixes (cheers @ChristianPV)
 
 ### v1.2.5
 
@@ -1099,7 +1157,7 @@ And some other changes and bug fixes:
 
 ### v1.0.26
 
-- Fixes for SASS (cheers @brunowego)
+- Fixes for Sass (cheers @brunowego)
 - Indentation reset to 4 spaces
 
 ### v1.0.25
@@ -1144,7 +1202,7 @@ And some other changes and bug fixes:
 
 ### v1.0.17
 
-- SASS support added (thanks to @brunowego)
+- Sass support added (thanks to @brunowego)
 - Docs completely separated to avoid any confusion
 - New gulp tasks (will add more documentation for this)
 

CONTROLS.md

@@ -35,7 +35,7 @@ controls: [
 
 ### Internationalization using default controls
 
-You can provide an `i18n` object as one of your options when initialising the plugin which we be used when rendering the controls.
+You can provide an `i18n` object as one of your options when initializing the plugin which we be used when rendering the controls.
 
 #### Example
 

README.md

@@ -1,3 +1,6 @@
+| 🎉  | [Plyr is merging into Vidstack](https://github.com/sampotts/plyr/issues/2408) | 🎉  |
+| :-: | :---------------------------------------------------------------------------: | :-- |
+
 Plyr is 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](#donate) - [Slack](https://bit.ly/plyr--chat)
@@ -27,7 +30,7 @@ Plyr is a simple, lightweight, accessible and customizable HTML5, YouTube and Vi
 - 🌎 **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
+- 💁‍♀️ **Sass** - to include in your build processes
 
 ### Demos
 
@@ -131,21 +134,21 @@ Alternatively you can include the `plyr.js` script before the closing `</body>`
 
 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.
+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 separately as part of your application but to make life easier you can use the polyfilled build.
 
 ```html
-<script src="https://cdn.plyr.io/3.6.6/plyr.js"></script>
+<script src="https://cdn.plyr.io/3.7.1/plyr.js"></script>
 ```
 
 ...or...
 
 ```html
-<script src="https://cdn.plyr.io/3.6.6/plyr.polyfilled.js"></script>
+<script src="https://cdn.plyr.io/3.7.1/plyr.polyfilled.js"></script>
 ```
 
 ## CSS
 
-Include the `plyr.css` stylsheet into your `<head>`.
+Include the `plyr.css` stylesheet into your `<head>`.
 
 ```html
 <link rel="stylesheet" href="path/to/plyr.css" />
@@ -154,13 +157,13 @@ Include the `plyr.css` stylsheet into your `<head>`.
 If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the default CSS, you can use the following:
 
 ```html
-<link rel="stylesheet" href="https://cdn.plyr.io/3.6.6/plyr.css" />
+<link rel="stylesheet" href="https://cdn.plyr.io/3.7.1/plyr.css" />
 ```
 
 ## SVG Sprite
 
 The SVG sprite is loaded automatically from our CDN (provided by [Fastly](https://www.fastly.com/)). To change this, see the [options](#options) below. For
-reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.6.6/plyr.svg`.
+reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.7.1/plyr.svg`.
 
 # Ads
 
@@ -184,43 +187,43 @@ Here's a list of the properties and what they are used for:
 
 | Name                                           | Description                                                                                             | Default / Fallback                                                    |
 | ---------------------------------------------- | ------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
-| `--plyr-color-main`                            | The primary UI color.                                                                                   | ![#f03c15](https://placehold.it/15/00b3ff/000000?text=+) `#00b3ff`    |
+| `--plyr-color-main`                            | The primary UI color.                                                                                   | ![#f03c15](https://place-hold.it/15/00b3ff/000000?text=+) `#00b3ff`   |
 | `--plyr-video-background`                      | The background color of video and poster wrappers for using alpha channel videos and poster images.     | `rgba(0, 0, 0, 1)`                                                    |
 | `--plyr-tab-focus-color`                       | The color used for the dotted outline when an element is `:focus-visible` (equivalent) keyboard focus.  | `--plyr-color-main`                                                   |
-| `--plyr-badge-background`                      | The background color for badges in the menu.                                                            | ![#4a5464](https://placehold.it/15/4a5464/000000?text=+) `#4a5464`    |
+| `--plyr-badge-background`                      | The background color for badges in the menu.                                                            | ![#4a5464](https://place-hold.it/15/4a5464/000000?text=+) `#4a5464`   |
-| `--plyr-badge-text-color`                      | The text color for badges.                                                                              | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-badge-text-color`                      | The text color for badges.                                                                              | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-badge-border-radius`                   | The border radius used for badges.                                                                      | `2px`                                                                 |
 | `--plyr-tab-focus-color`                       | The color used to highlight tab (keyboard) focus.                                                       | `--plyr-color-main`                                                   |
 | `--plyr-captions-background`                   | The color for the background of captions.                                                               | `rgba(0, 0, 0, 0.8)`                                                  |
-| `--plyr-captions-text-color`                   | The color used for the captions text.                                                                   | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-captions-text-color`                   | The color used for the captions text.                                                                   | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-control-icon-size`                     | The size of the icons used in the controls.                                                             | `18px`                                                                |
 | `--plyr-control-spacing`                       | The space between controls (sometimes used in a multiple - e.g. `10px / 2 = 5px`).                      | `10px`                                                                |
 | `--plyr-control-padding`                       | The padding inside controls.                                                                            | `--plyr-control-spacing * 0.7` (`7px`)                                |
 | `--plyr-control-radius`                        | The border radius used on controls.                                                                     | `3px`                                                                 |
 | `--plyr-control-toggle-checked-background`     | The background color used for checked menu items.                                                       | `--plyr-color-main`                                                   |
 | `--plyr-video-controls-background`             | The background for the video controls.                                                                  | `linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.75))`              |
-| `--plyr-video-control-color`                   | The text/icon color for video controls.                                                                 | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-video-control-color`                   | The text/icon color for video controls.                                                                 | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
-| `--plyr-video-control-color-hover`             | The text/icon color used when video controls are `:hover`, `:focus` and `:focus-visible` (equivalent).  | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-video-control-color-hover`             | The text/icon color used when video controls are `:hover`, `:focus` and `:focus-visible` (equivalent).  | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-video-control-background-hover`        | The background color used when video controls are `:hover`, `:focus` and `:focus-visible` (equivalent). | `--plyr-color-main`                                                   |
-| `--plyr-audio-controls-background`             | The background for the audio controls.                                                                  | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-audio-controls-background`             | The background for the audio controls.                                                                  | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
-| `--plyr-audio-control-color`                   | The text/icon color for audio controls.                                                                 | ![#4a5464](https://placehold.it/15/4a5464/000000?text=+) `#4a5464`    |
+| `--plyr-audio-control-color`                   | The text/icon color for audio controls.                                                                 | ![#4a5464](https://place-hold.it/15/4a5464/000000?text=+) `#4a5464`   |
-| `--plyr-audio-control-color-hover`             | The text/icon color used when audio controls are `:hover`, `:focus` and `:focus-visible` (equivalent).  | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-audio-control-color-hover`             | The text/icon color used when audio controls are `:hover`, `:focus` and `:focus-visible` (equivalent).  | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-audio-control-background-hover`        | The background color used when video controls are `:hover`, `:focus` and `:focus-visible` (equivalent). | `--plyr-color-main`                                                   |
 | `--plyr-menu-background`                       | The background color for menus.                                                                         | `rgba(255, 255, 255, 0.9)`                                            |
-| `--plyr-menu-color`                            | The text/icon color for menu items.                                                                     | ![#4a5464](https://placehold.it/15/4a5464/000000?text=+) `#4a5464`    |
+| `--plyr-menu-color`                            | The text/icon color for menu items.                                                                     | ![#4a5464](https://place-hold.it/15/4a5464/000000?text=+) `#4a5464`   |
 | `--plyr-menu-shadow`                           | The shadow used on menus.                                                                               | `0 1px 2px rgba(0, 0, 0, 0.15)`                                       |
 | `--plyr-menu-radius`                           | The border radius on the menu.                                                                          | `4px`                                                                 |
 | `--plyr-menu-arrow-size`                       | The size of the arrow on the bottom of the menu.                                                        | `6px`                                                                 |
-| `--plyr-menu-item-arrow-color`                 | The color of the arrows in the menu.                                                                    | ![#728197](https://placehold.it/15/728197/000000?text=+) `#728197`    |
+| `--plyr-menu-item-arrow-color`                 | The color of the arrows in the menu.                                                                    | ![#728197](https://place-hold.it/15/728197/000000?text=+) `#728197`   |
 | `--plyr-menu-item-arrow-size`                  | The size of the arrows in the menu.                                                                     | `4px`                                                                 |
-| `--plyr-menu-border-color`                     | The border color for the bottom of the back button in the top of the sub menu pages.                    | ![#dcdfe5](https://placehold.it/15/dcdfe5/000000?text=+) `#dcdfe5`    |
+| `--plyr-menu-border-color`                     | The border color for the bottom of the back button in the top of the sub menu pages.                    | ![#dcdfe5](https://place-hold.it/15/dcdfe5/000000?text=+) `#dcdfe5`   |
-| `--plyr-menu-border-shadow-color`              | The shadow below the border of the back button in the top of the sub menu pages.                        | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-menu-border-shadow-color`              | The shadow below the border of the back button in the top of the sub menu pages.                        | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-progress-loading-size`                 | The size of the stripes in the loading state in the scrubber.                                           | `25px`                                                                |
 | `--plyr-progress-loading-background`           | The background color on the loading state in the scrubber.                                              | `rgba(35, 40, 47, 0.6)`                                               |
 | `--plyr-video-progress-buffered-background`    | The fill color for the buffer indication in the scrubber for video.                                     | `rgba(255, 255, 255, 0.25)`                                           |
 | `--plyr-audio-progress-buffered-background`    | The fill color for the buffer indication in the scrubber for audio.                                     | `rgba(193, 200, 209, 0.6)`                                            |
 | `--plyr-range-thumb-height`                    | The height of the scrubber handle/thumb.                                                                | `13px`                                                                |
-| `--plyr-range-thumb-background`                | The background of the scrubber handle/thumb.                                                            | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff`    |
+| `--plyr-range-thumb-background`                | The background of the scrubber handle/thumb.                                                            | ![#ffffff](https://place-hold.it/15/ffffff/000000?text=+) `#ffffff`   |
 | `--plyr-range-thumb-shadow`                    | The shadow of the scrubber handle/thumb.                                                                | `0 1px 1px rgba(215, 26, 18, 0.15), 0 0 0 1px rgba(215, 26, 18, 0.2)` |
 | `--plyr-range-thumb-active-shadow-width`       | The width of the shadow when the scrubber handle/thumb is `:active` (pressed).                          | `3px`                                                                 |
 | `--plyr-range-track-height`                    | The height of the scrubber/progress track.                                                              | `5px`                                                                 |
@@ -230,7 +233,7 @@ Here's a list of the properties and what they are used for:
 | `--plyr-audio-range-track-background`          | The background of the scrubber/progress.                                                                | `--plyr-video-progress-buffered-background`                           |
 | `--plyr-audio-range-thumb-active-shadow-color` | The color of the shadow when the audio scrubber handle/thumb is `:active` (pressed).                    | `rgba(215, 26, 18, 0.1)`                                              |
 | `--plyr-tooltip-background`                    | The background color for tooltips.                                                                      | `rgba(255, 255, 255, 0.9)`                                            |
-| `--plyr-tooltip-color`                         | The text color for tooltips.                                                                            | ![#4a5464](https://placehold.it/15/4a5464/000000?text=+) `#4a5464`    |
+| `--plyr-tooltip-color`                         | The text color for tooltips.                                                                            | ![#4a5464](https://place-hold.it/15/4a5464/000000?text=+) `#4a5464`   |
 | `--plyr-tooltip-padding`                       | The padding for tooltips.                                                                               | `calc(var(--plyr-control-spacing) / 2))`                              |
 | `--plyr-tooltip-arrow-size`                    | The size of the arrow under tooltips.                                                                   | `4px`                                                                 |
 | `--plyr-tooltip-radius`                        | The border radius on tooltips.                                                                          | `3px`                                                                 |
@@ -267,14 +270,12 @@ You can set them in your CSS for all players:
 ...or in your HTML:
 
 ```html
-<video class="player" style="--plyr-color-main: #1ac266;">
+<video class="player" style="--plyr-color-main: #1ac266;">...</video>
-    ...
-</video>
 ```
 
-### SASS
+### Sass
 
-You can use `plyr.scss` file included in `/src/sass` as part of your build and change variables to suit your design. The SASS requires you to
+You can use `plyr.scss` file included in `/src/sass` as part of your build and change variables to suit your design. The Sass requires you to
 use [autoprefixer](https://www.npmjs.com/package/gulp-autoprefixer) (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
@@ -344,7 +345,7 @@ The HTMLElement or string selector can be the target `<video>`, `<audio>`, or `<
 You have two choices here. You can either use a simple array loop to map the constructor:
 
 ```javascript
-const players = Array.from(document.querySelectorAll('.js-player')).map(p => new Plyr(p));
+const players = Array.from(document.querySelectorAll('.js-player')).map((p) => new Plyr(p));
 ```
 
 ...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:
@@ -400,11 +401,11 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke
 | `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).                                                                                        |
+| `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 non-selectable language options).                                                                                      |
 | `fullscreen`         | Object                     | `{ enabled: true, fallback: true, iosNative: false, container: null }`                                                         | `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). `container`: A selector for an ancestor of the player element, allows contextual content to remain visual in fullscreen mode. Non-ancestors are ignored.     |
 | `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.                                                                                                                                                                     |
+| `speed`              | Object                     | `{ selected: 1, options: [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 4] }`                                                              | `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: '', tagUrl: '' }`                                                                              | `enabled`: Whether to enable advertisements. `publisherId`: Your unique [vi.ai](https://vi.ai/publisher-video-monetization/?aid=plyrio) publisher ID. `tagUrl` is a URL for a custom VAST tag if you're not using Vi.                                                                                                                                                                                   |
@@ -412,6 +413,8 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke
 | `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.                                                                                                                            |
+| `mediaMetadata`      | Object                     | `{ title: '', artist: '', album: '', artwork: [] }`                                                                            | The [MediaMetadata](https://developer.mozilla.org/en-US/docs/Web/API/MediaMetadata) interface of the Media Session API allows a web page to provide rich media metadata for display in a platform UI.                                                                                                                                                                                                   |
+| `markers`            | Object                     | `{ enabled: false, points: [] }`                                                                                               | `enabled`: Whether to enable markers. `points` is an array of `{ time: number; label: string; }` objects where `time` represents the marker position in seconds and `label` is the HTML string to be displayed.                                                                                                                                                                                         |
 
 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:
@@ -437,7 +440,7 @@ const player = new Plyr('#player', {
 You can also access the object through any events:
 
 ```javascript
-element.addEventListener('ready', event => {
+element.addEventListener('ready', (event) => {
   const player = event.detail.plyr;
 });
 ```
@@ -452,7 +455,7 @@ player.fullscreen.enter(); // Enter fullscreen
 ```
 
 | Method                                                   | Parameters       | Description                                                                                                |
-| -------------------------- | ---------------- | ---------------------------------------------------------------------------------------------------------- |
+| -------------------------------------------------------- | ---------------- | ---------------------------------------------------------------------------------------------------------- |
 | `play()`&sup1;                                           | -                | Start playback.                                                                                            |
 | `pause()`                                                | -                | Pause playback.                                                                                            |
 | `togglePlay(toggle)`&sup1;                               | Boolean          | Toggle playback, if no parameters are passed, it will toggle based on current status.                      |
@@ -467,6 +470,7 @@ player.fullscreen.enter(); // Enter fullscreen
 | `fullscreen.exit()`                                      | -                | Exit fullscreen.                                                                                           |
 | `fullscreen.toggle()`                                    | -                | Toggle fullscreen.                                                                                         |
 | `airplay()`                                              | -                | Trigger the airplay dialog on supported devices.                                                           |
+| `setPreviewThumbnails(source: PreviewThumbnailsOptions)` | -                | Sets the preview thumbnails for the current source.                                                        |
 | `toggleControls(toggle)`                                 | Boolean          | Toggle the controls (video only). Takes optional truthy value to force it on/off.                          |
 | `on(event, function)`                                    | String, Function | Add an event listener for the specified event.                                                             |
 | `once(event, function)`                                  | String, Function | Add an event listener for the specified event once.                                                        |
@@ -513,6 +517,7 @@ player.fullscreen.active; // false;
 | `loop`               | ✓      | ✓      | Gets or sets the current loop state of the player. The setter accepts a boolean.                                                                                                                                                                                                                                                       |
 | `source`             | ✓      | ✓      | Gets or sets the current source for the player. The setter accepts an object. See [source setter](#the-source-setter) below for examples.                                                                                                                                                                                              |
 | `poster`             | ✓      | ✓      | Gets or sets the current poster image for the player. The setter accepts a string; the URL for the updated poster image.                                                                                                                                                                                                               |
+| `previewThumbnails`  | ✓      | ✓      | Gets or sets the current preview thumbnail source for the player. The setter accepts a string                                                                                                                                                                                                                                          |
 | `autoplay`           | ✓      | ✓      | Gets or sets the autoplay state of the player. The setter accepts a boolean.                                                                                                                                                                                                                                                           |
 | `currentTrack`       | ✓      | ✓      | Gets or sets the caption track by index. `-1` means the track is missing or captions is not active                                                                                                                                                                                                                                     |
 | `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. |
@@ -635,7 +640,7 @@ reference to the instance, you can use the `on()` API method or `addEventListene
 property. Here's an example:
 
 ```javascript
-player.on('ready', event => {
+player.on('ready', (event) => {
   const instance = event.detail.plyr;
 });
 ```
@@ -783,7 +788,7 @@ If a User Agent is disabled but supports `<video>` and `<audio>` natively, it wi
 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/)                   |
 | 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)             |
@@ -791,7 +796,7 @@ Some awesome folks have made plugins for CMSs and Components for JavaScript fram
 | 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)           |
-| svelte-plyr    | Ben Woodward / benwoodward ([@benwoodward](https://github.com/benwoodward)) | [https://github.com/benwoodward](https://github.com/benwoodward)           |
+| svelte-plyr | Ben Woodward / benwoodward ([@benwoodward](https://github.com/benwoodward)) | [https://github.com/benwoodward/svelte-plyr](https://github.com/benwoodward/svelte-plyr)     |
 
 # Issues
 
@@ -840,6 +845,7 @@ Plyr costs money to run, not only my time. I donate my time for free as I enjoy
 - [pressakey.com | Blog-Magazin für Videospiele](https://pressakey.com)
 - [STROLLÿN: Work with a View](https://strollyn.com)
 - [CFDA Runway360](https://runway360.cfda.com/)
+- [NKLAV | Filmmaker](https://nklav.com)
 
 If you want to be added to the list, open a pull request. It'd be awesome to see how you're using Plyr 😎
 

cspell.json

@@ -0,0 +1,40 @@
+{
+  "version": "0.2",
+  "ignorePaths": [
+    "package.json",
+    "dist/*",
+    "demo/node_modules/*"
+  ],
+  "dictionaryDefinitions": [],
+  "dictionaries": [],
+  "words": [
+    "autopause",
+    "autoplay",
+    "bote",
+    "cfda",
+    "classname",
+    "digbmx",
+    "fastly",
+    "fullscreen",
+    "gordita",
+    "loadjs",
+    "magazin",
+    "menuitemradio",
+    "noupe",
+    "otransitionend",
+    "playsinline",
+    "plyr",
+    "rutheneum",
+    "seektime",
+    "selz",
+    "sparkk",
+    "srclang",
+    "strol",
+    "stylelint",
+    "unmute",
+    "videospiele",
+    "xywh"
+  ],
+  "ignoreWords": [],
+  "import": []
+}

demo/index.html

@@ -105,14 +105,6 @@
           </button>
         </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">
           <a href="https://github.com/sampotts/plyr" target="_blank" class="button js-shr">
             <svg class="icon" role="presentation">

demo/src/js/demo.js

@@ -17,9 +17,10 @@ import toggleClass from './toggle-class';
 
 (() => {
   const production = 'plyr.io';
+  const isProduction = window.location.host.includes(production);
 
   // Sentry for demo site (https://plyr.io) only
-  if (window.location.host === production) {
+  if (isProduction) {
     Sentry.init({
       dsn: 'https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555',
       whitelistUrls: [production].map((d) => new RegExp(`https://(([a-z0-9])+(.))*${d}`)),
@@ -53,10 +54,10 @@ import toggleClass from './toggle-class';
       captions: {
         active: true,
       },
-      ads: {
+      /* ads: {
-        enabled: window.location.host.includes(production),
+        enabled: isProduction,
         publisherId: '918848828995742',
-      },
+      }, */
       previewThumbnails: {
         enabled: true,
         src: ['https://cdn.plyr.io/static/demo/thumbs/100p.vtt', 'https://cdn.plyr.io/static/demo/thumbs/240p.vtt'],
@@ -65,6 +66,34 @@ import toggleClass from './toggle-class';
         // Prevent Vimeo blocking plyr.io demo site
         referrerPolicy: 'no-referrer',
       },
+      mediaMetadata: {
+        title: 'View From A Blue Moon',
+        album: 'Sports',
+        artist: 'Brainfarm',
+        artwork: [
+          {
+            src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg',
+            type: 'image/jpeg',
+          },
+        ],
+      },
+      markers: {
+        enabled: true,
+        points: [
+          {
+            time: 10,
+            label: 'first marker',
+          },
+          {
+            time: 40,
+            label: 'second marker',
+          },
+          {
+            time: 120,
+            label: '<strong>third</strong> marker',
+          },
+        ],
+      },
     });
 
     // Expose for tinkering in the console

demo/src/js/tab-focus.js

@@ -13,7 +13,7 @@ document.addEventListener('focusout', (event) => {
 
 // Add classname to tabbed elements
 document.addEventListener('keydown', (event) => {
-  if (event.keyCode !== 9) {
+  if (event.key !== 'Tab') {
     return;
   }
 

demo/src/sass/bundles/demo.scss

@@ -1,9 +1,11 @@
+@charset "UTF-8";
+
 // ==========================================================================
 // Plyr.io Demo Page
 // ==========================================================================
-@charset 'UTF-8';
 
 @import '../../../../src/sass/lib/css-vars';
+
 $css-vars-use-native: true;
 
 // Settings

demo/src/sass/bundles/error.scss

@@ -1,7 +1,8 @@
+@charset "UTF-8";
+
 // ==========================================================================
 // Plyr.io Error Page
 // ==========================================================================
-@charset 'UTF-8';
 
 // Settings
 @import '../settings/colors';

demo/src/sass/components/buttons.scss

@@ -45,7 +45,7 @@
   }
 
   &.tab-focus {
-    @include tab-focus();
+    @include tab-focus;
   }
 
   &:active {
@@ -64,7 +64,7 @@
 
 // Count bubble
 .button__count {
-  animation: fadein 0.2s ease;
+  animation: fade-in 0.2s ease;
   background: $color-button-count-background;
   color: $color-button-count-text;
   margin-left: ($spacing-base * 0.75);

demo/src/sass/components/header.scss

@@ -7,7 +7,7 @@ header {
   text-align: center;
 
   h1 span {
-    animation: shrinkHide 1s cubic-bezier(0.175, 0.885, 0.32, 1.275) 2s forwards;
+    animation: shrink-hide 1s cubic-bezier(0.175, 0.885, 0.32, 1.275) 2s forwards;
     display: inline-block;
     font-weight: $font-weight-light;
     opacity: 0.5;

demo/src/sass/components/icons.scss

@@ -2,6 +2,8 @@
 // Icons
 // ==========================================================================
 
+@use 'sass:math';
+
 // Base size icon styles
 .icon {
   fill: currentColor;
@@ -19,5 +21,5 @@ label svg {
 
 a .icon,
 .btn .icon {
-  margin-right: ($spacing-base / 2);
+  margin-right: math.div($spacing-base, 4);
 }

demo/src/sass/components/links.scss

@@ -5,7 +5,7 @@
 // Make a <button> look like an <a>
 button.faux-link {
   @extend a; // stylelint-disable-line
-  @include cancel-button-styles();
+  @include cancel-button-styles;
 }
 
 // Links
@@ -39,7 +39,7 @@ a {
   }
 
   &.tab-focus {
-    @include tab-focus();
+    @include tab-focus;
   }
 
   &.no-border::after {

demo/src/sass/components/players.scss

@@ -2,6 +2,8 @@
 // Examples
 // ==========================================================================
 
+@use 'sass:math';
+
 // Example players
 .plyr {
   border-radius: $border-radius-large;
@@ -31,6 +33,6 @@
   color: $color-gray-500;
 
   .icon {
-    margin-right: ceil($spacing-base / 6);
+    margin-right: math.div($spacing-base, 6);
   }
 }

demo/src/sass/layout/core.scss

@@ -2,6 +2,8 @@
 // Core
 // ==========================================================================
 
+@use 'sass:math';
+
 html,
 body {
   display: flex;
@@ -46,7 +48,7 @@ aside {
 
   .icon {
     fill: $color-twitter;
-    margin-right: ($spacing-base / 2);
+    margin-right: math.div($spacing-base, 2);
   }
 
   p {

demo/src/sass/lib/animation.scss

@@ -3,23 +3,26 @@
 // ==========================================================================
 
 // Fade
-@keyframes fadein {
+@keyframes fade-in {
   0% {
     opacity: 0;
   }
+
   100% {
     opacity: 1;
   }
 }
 
-@keyframes shrinkHide {
+@keyframes shrink-hide {
   0% {
     opacity: 0.5;
     width: 38px;
   }
+
   20% {
     width: 45px;
   }
+
   100% {
     opacity: 0;
     width: 0;

demo/src/sass/lib/fontface.scss

@@ -4,7 +4,7 @@
 
 @font-face {
   font-display: swap;
-  font-family: 'Gordita';
+  font-family: Gordita;
   font-style: normal;
   font-weight: $font-weight-light;
   src: url('https://cdn.plyr.io/static/fonts/gordita-light.woff2') format('woff2'),
@@ -13,7 +13,7 @@
 
 @font-face {
   font-display: swap;
-  font-family: 'Gordita';
+  font-family: Gordita;
   font-style: normal;
   font-weight: $font-weight-regular;
   src: url('https://cdn.plyr.io/static/fonts/gordita-regular.woff2') format('woff2'),
@@ -22,7 +22,7 @@
 
 @font-face {
   font-display: swap;
-  font-family: 'Gordita';
+  font-family: Gordita;
   font-style: normal;
   font-weight: $font-weight-medium;
   src: url('https://cdn.plyr.io/static/fonts/gordita-medium.woff2') format('woff2'),
@@ -31,7 +31,7 @@
 
 @font-face {
   font-display: swap;
-  font-family: 'Gordita';
+  font-family: Gordita;
   font-style: normal;
   font-weight: $font-weight-bold;
   src: url('https://cdn.plyr.io/static/fonts/gordita-bold.woff2') format('woff2'),
@@ -40,7 +40,7 @@
 
 @font-face {
   font-display: swap;
-  font-family: 'Gordita';
+  font-family: Gordita;
   font-style: normal;
   font-weight: $font-weight-black;
   src: url('https://cdn.plyr.io/static/fonts/gordita-black.woff2') format('woff2'),

demo/src/sass/lib/mixins.scss

@@ -2,6 +2,8 @@
 // Mixins
 // ==========================================================================
 
+@use 'sass:math';
+
 // Convert a <button> into an <a>
 // ---------------------------------------
 @mixin cancel-button-styles() {
@@ -16,7 +18,7 @@
   position: relative;
   text-align: inherit;
   text-shadow: inherit;
-  -moz-user-select: text; // stylelint-disable-line
+  user-select: text;
   vertical-align: baseline;
   width: auto;
 }
@@ -32,7 +34,7 @@
 // Leave <body> at 100%/16px
 // ---------------------------------------
 @function calculate-rem($size) {
-  $rem: $size / 16;
+  $rem: math.div($size, 16);
   @return #{$rem}rem;
 }
 

demo/src/sass/lib/normalize.scss

@@ -11,8 +11,7 @@
 
 html {
   line-height: 1.15; /* 1 */
-  -ms-text-size-adjust: 100%; /* 2 */
+  text-size-adjust: 100%; /* 2 */
-  -webkit-text-size-adjust: 100%; /* 2 */
 }
 
 /* Sections
@@ -89,7 +88,7 @@ hr {
    */
 
 pre {
-  font-family: monospace, monospace; /* 1 */
+  font-family: monospace; /* 1 */
   font-size: 1em; /* 2 */
 }
 
@@ -103,7 +102,7 @@ pre {
 
 a {
   background-color: transparent; /* 1 */
-  -webkit-text-decoration-skip: objects; /* 2 */
+  text-decoration-skip: objects; /* 2 */
 }
 
 /**
@@ -112,7 +111,7 @@ a {
    */
 
 abbr[title] {
-  border-bottom: none; /* 1 */
+  border-bottom: 0; /* 1 */
   text-decoration: underline; /* 2 */
   text-decoration: underline dotted; /* 2 */
 }
@@ -281,7 +280,7 @@ button,
 html [type='button'],
 [type='reset'],
 [type='submit'] {
-  -webkit-appearance: button; /* 2 */
+  appearance: button; /* 2 */
 }
 
 /**
@@ -375,7 +374,7 @@ textarea {
    */
 
 [type='search'] {
-  -webkit-appearance: textfield; /* 1 */
+  appearance: textfield; /* 1 */
   outline-offset: -2px; /* 2 */
 }
 
@@ -385,7 +384,7 @@ textarea {
 
 [type='search']::-webkit-search-cancel-button,
 [type='search']::-webkit-search-decoration {
-  -webkit-appearance: none;
+  appearance: none;
 }
 
 /**
@@ -394,7 +393,7 @@ textarea {
    */
 
 ::-webkit-file-upload-button {
-  -webkit-appearance: button; /* 1 */
+  appearance: button; /* 1 */
   font: inherit; /* 2 */
 }
 

demo/src/sass/settings/colors.scss

@@ -3,7 +3,7 @@
 // ==========================================================================
 
 // Grayscale
-$color-gray-900: hsl(210, 15%, 16%);
+$color-gray-900: hsl(210deg 15% 16%);
 $color-gray-800: lighten($color-gray-900, 9%);
 $color-gray-700: lighten($color-gray-800, 9%);
 $color-gray-600: lighten($color-gray-700, 9%);
@@ -15,7 +15,7 @@ $color-gray-100: lighten($color-gray-200, 9%);
 $color-gray-50: lighten($color-gray-100, 9%);
 
 // Branding
-$color-brand-primary: hsl(198, 100%, 50%);
+$color-brand-primary: hsl(198deg 100% 50%);
 
 // Text
 $color-text: $color-gray-700;
@@ -28,13 +28,13 @@ $color-twitter: #4baaf4;
 $color-link: $color-brand-primary;
 
 // Background
-$color-background-from: hsl(198, 100%, 94%);
+$color-background-from: hsl(198deg 100% 94%);
-$color-background-to: hsl(198, 100%, 98%);
+$color-background-to: hsl(198deg 100% 98%);
 
 // Buttons
 $color-button-background: $color-brand-primary;
 $color-button-text: #fff;
-$color-button-background-hover: hsl(198, 100%, 55%);
+$color-button-background-hover: hsl(198deg 100% 55%);
 $color-button-count-background: #fff;
 $color-button-count-text: $color-gray-600;
 

demo/src/sass/settings/type.scss

@@ -4,18 +4,14 @@
 
 $font-sans-serif: 'Gordita', 'Avenir', 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
   'Segoe UI Symbol';
-
 $font-size-base: 15;
 $font-size-small: 13;
 $font-size-large: 18;
 $font-size-h1: 64;
-
 $font-weight-light: 300;
 $font-weight-regular: 400;
 $font-weight-medium: 500;
 $font-weight-bold: 600;
 $font-weight-black: 900;
-
 $line-height-base: 1.75;
-
 $letter-spacing-headings: -0.025em;

demo/src/sass/type/base.scss

@@ -8,8 +8,9 @@ html {
 }
 
 body {
-  @include font-smoothing();
+  @include font-smoothing;
   @include font-size($font-size-base);
+
   color: $color-text;
   font-family: $font-sans-serif;
   font-weight: $font-weight-medium;
@@ -30,5 +31,6 @@ small {
 
 small {
   @include font-size($font-size-small);
+
   display: block;
 }

demo/src/sass/type/headings.scss

@@ -4,6 +4,7 @@
 
 h1 {
   @include font-size($font-size-h1);
+
   color: $color-headings;
   font-weight: $font-weight-bold;
   letter-spacing: $letter-spacing-headings;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plyr",
-  "version": "3.6.6",
+  "version": "3.7.1",
   "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
   "homepage": "https://plyr.io",
   "author": "Sam Potts <sam@potts.es>",
@@ -31,66 +31,67 @@
   "browserslist": "> 1%",
   "scripts": {
     "build": "gulp build",
-    "lint": "eslint src/js && npm run-script remark",
+    "lint": "eslint src/js && npm run remark && stylelint **/*.scss",
-    "lint:fix": "eslint --fix src/js",
+    "lint:fix": "eslint --fix src/js && stylelint **/*.scss --fix",
     "remark": "remark -f --use 'validate-links=repository:\"sampotts/plyr\"' '{,!(node_modules),.?**/}*.md'",
     "deploy": "yarn lint && gulp version && gulp build && gulp deploy",
     "format": "prettier --write \"./{src,demo/src}/**/*.{js,scss}\"",
+    "spellcheck": "cspell \"**/*.{js,md,scss,json}\" --no-must-find-files",
     "start": "gulp"
   },
   "devDependencies": {
+    "@babel/core": "^7.17.9",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/preset-env": "^7.16.11",
     "@sampotts/eslint-config": "1.1.7",
-    "autoprefixer": "^10.2.5",
+    "autoprefixer": "^10.4.4",
-    "aws-sdk": "^2.888.0",
+    "aws-sdk": "^2.1116.0",
-    "@babel/core": "^7.13.15",
-    "@babel/preset-env": "^7.13.15",
-    "@babel/plugin-proposal-class-properties": "^7.13.0",
     "babel-eslint": "^10.1.0",
-    "browser-sync": "^2.26.14",
+    "browser-sync": "^2.27.9",
-    "colorette": "1.2.2",
+    "colorette": "2.0.16",
-    "cssnano": "^5.0.1",
+    "cspell": "^5.19.7",
+    "cssnano": "^5.1.7",
     "del": "^6.0.0",
     "eslint": "^7.23.0",
-    "fancy-log": "^1.3.3",
+    "fancy-log": "^2.0.0",
     "git-branch": "^2.0.1",
     "gulp": "^4.0.2",
-    "gulp-awspublish": "^4.1.2",
+    "gulp-awspublish": "^6.0.2",
     "gulp-better-rollup": "^4.0.1",
-    "gulp-filter": "^6.0.0",
+    "gulp-filter": "^7.0.0",
     "gulp-header": "^2.0.9",
     "gulp-hub": "^4.2.0",
     "gulp-if": "^3.0.0",
     "gulp-imagemin": "^7.1.0",
     "gulp-open": "^3.0.1",
     "gulp-plumber": "^1.2.1",
-    "gulp-postcss": "^9.0.0",
+    "gulp-postcss": "^9.0.1",
     "gulp-rename": "^2.0.0",
-    "gulp-replace": "^1.0.0",
+    "gulp-replace": "^1.1.3",
-    "gulp-sass": "^4.1.0",
+    "gulp-sass": "^5.1.0",
-    "gulp-size": "^3.0.0",
+    "gulp-size": "^4.0.1",
     "gulp-sourcemaps": "^3.0.0",
-    "gulp-svgstore": "^7.0.1",
+    "gulp-svgstore": "^9.0.0",
-    "gulp-terser": "^2.0.1",
+    "gulp-terser": "^2.1.0",
-    "postcss": "^8.2.10",
+    "postcss": "^8.4.12",
-    "postcss-custom-properties": "^11.0.0",
+    "postcss-custom-properties": "^12.1.7",
+    "postcss-scss": "^4.0.3",
     "prettier-eslint": "^12.0.0",
     "prettier-stylelint": "^0.4.2",
-    "remark-cli": "^9.0.0",
+    "remark-cli": "^10.0.1",
-    "remark-validate-links": "^10.0.4",
+    "remark-validate-links": "^11.0.2",
-    "rollup": "^2.45.2",
+    "rollup": "^2.70.2",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "stylelint": "^13.12.0",
+    "sass": "^1.50.0",
-    "stylelint-config-prettier": "^8.0.2",
+    "stylelint": "^14.7.1",
-    "stylelint-config-recommended": "^4.0.0",
+    "stylelint-config-prettier": "^9.0.3",
-    "stylelint-config-sass-guidelines": "^8.0.0",
+    "stylelint-config-sass-guidelines": "^9.0.1",
-    "stylelint-order": "^4.1.0",
+    "stylelint-selector-bem-pattern": "^2.1.1"
-    "stylelint-scss": "^3.19.0",
-    "stylelint-selector-bem-pattern": "^2.1.0"
   },
   "dependencies": {
-    "core-js": "^3.10.1",
+    "core-js": "^3.22.0",
     "custom-event-polyfill": "^1.0.7",
     "loadjs": "^4.2.0",
     "rangetouch": "^2.0.1",

plyr.code-workspace

@@ -12,7 +12,9 @@
 
     // Linting
     "stylelint.enable": true,
+    "stylelint.validate": ["css", "scss"],
     "css.validate": false,
+    "less.validate": false,
     "scss.validate": false,
     "javascript.validate.enable": false,
 

src/js/captions.js

@@ -154,7 +154,9 @@ const captions = {
     }
 
     // Enable or disable captions based on track length
+    if (this.elements) {
       toggleClass(this.elements.container, this.config.classNames.captions.enabled, !is.empty(tracks));
+    }
 
     // Update available languages in list
     if (

src/js/config/defaults.js

@@ -61,7 +61,7 @@ const defaults = {
   // Sprite (for icons)
   loadSprite: true,
   iconPrefix: 'plyr',
-  iconUrl: 'https://cdn.plyr.io/3.6.6/plyr.svg',
+  iconUrl: 'https://cdn.plyr.io/3.7.1/plyr.svg',
 
   // Blank video (used to prevent errors on source change)
   blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@@ -350,6 +350,7 @@ const defaults = {
     hover: 'plyr--hover',
     tooltip: 'plyr__tooltip',
     cues: 'plyr__cues',
+    marker: 'plyr__progress__marker',
     hidden: 'plyr__sr-only',
     hideControls: 'plyr--hide-controls',
     isIos: 'plyr--is-ios',
@@ -398,6 +399,7 @@ const defaults = {
     embed: {
       provider: 'data-plyr-provider',
       id: 'data-plyr-embed-id',
+      hash: 'data-plyr-embed-hash',
     },
   },
 
@@ -440,6 +442,20 @@ const defaults = {
     customControls: true,
     noCookie: false, // Whether to use an alternative version of YouTube without cookies
   },
+
+  // Media Metadata
+  mediaMetadata: {
+    title: '',
+    artist: '',
+    album: '',
+    artwork: [],
+  },
+
+  // Markers
+  markers: {
+    enabled: false,
+    points: [],
+  },
 };
 
 export default defaults;

src/js/controls.js

@@ -38,7 +38,8 @@ const controls = {
   // Get icon URL
   getIconUrl() {
     const url = new URL(this.config.iconUrl, window.location);
-    const cors = url.host !== window.location.host || (browser.isIE && !window.svg4everybody);
+    const host = window.location.host ? window.location.host : window.top.location.host;
+    const cors = url.host !== host || (browser.isIE && !window.svg4everybody);
 
     return {
       url: this.config.iconUrl,
@@ -403,7 +404,7 @@ const controls = {
       'keydown keyup',
       (event) => {
         // We only care about space and ⬆️ ⬇️️ ➡️
-        if (![32, 38, 39, 40].includes(event.which)) {
+        if (!['Space', 'ArrowUp', 'ArrowDown', 'ArrowRight'].includes(event.key)) {
           return;
         }
 
@@ -419,13 +420,13 @@ const controls = {
         const isRadioButton = matches(menuItem, '[role="menuitemradio"]');
 
         // Show the respective menu
-        if (!isRadioButton && [32, 39].includes(event.which)) {
+        if (!isRadioButton && ['Space', 'ArrowRight'].includes(event.key)) {
           controls.showMenuPanel.call(this, type, true);
         } else {
           let target;
 
-          if (event.which !== 32) {
+          if (event.key !== 'Space') {
-            if (event.which === 40 || (isRadioButton && event.which === 39)) {
+            if (event.key === 'ArrowDown' || (isRadioButton && event.key === 'ArrowRight')) {
               target = menuItem.nextElementSibling;
 
               if (!is.element(target)) {
@@ -449,9 +450,7 @@ const controls = {
     // Enter will fire a `click` event but we still need to manage focus
     // So we bind to keyup which fires after and set focus here
     on.call(this, menuItem, 'keyup', (event) => {
-      if (event.which !== 13) {
+      if (event.key !== 'Return') return;
-        return;
-      }
 
       controls.focusFirstMenuItem.call(this, null, true);
     });
@@ -483,7 +482,7 @@ const controls = {
 
     menuItem.appendChild(flex);
 
-    // Replicate radio button behaviour
+    // Replicate radio button behavior
     Object.defineProperty(menuItem, 'checked', {
       enumerable: true,
       get() {
@@ -505,7 +504,7 @@ const controls = {
       menuItem,
       'click keyup',
       (event) => {
-        if (is.keyboardEvent(event) && event.which !== 32) {
+        if (is.keyboardEvent(event) && event.key !== 'Space') {
           return;
         }
 
@@ -697,8 +696,9 @@ const controls = {
       return;
     }
 
+    const tipElement = this.elements.display.seekTooltip;
     const visible = `${this.config.classNames.tooltip}--visible`;
-    const toggle = (show) => toggleClass(this.elements.display.seekTooltip, visible, show);
+    const toggle = (show) => toggleClass(tipElement, visible, show);
 
     // Hide on touch
     if (this.touch) {
@@ -712,8 +712,8 @@ const controls = {
 
     if (is.event(event)) {
       percent = (100 / clientRect.width) * (event.pageX - clientRect.left);
-    } else if (hasClass(this.elements.display.seekTooltip, visible)) {
+    } else if (hasClass(tipElement, visible)) {
-      percent = parseFloat(this.elements.display.seekTooltip.style.left, 10);
+      percent = parseFloat(tipElement.style.left, 10);
     } else {
       return;
     }
@@ -725,11 +725,21 @@ const controls = {
       percent = 100;
     }
 
+    const time = (this.duration / 100) * percent;
+
     // Display the time a click would seek to
-    controls.updateTimeDisplay.call(this, this.elements.display.seekTooltip, (this.duration / 100) * percent);
+    tipElement.innerText = controls.formatTime(time);
+
+    // Get marker point for time
+    const point = this.config.markers?.points?.find(({ time: t }) => t === Math.round(time));
+
+    // Append the point label to the tooltip
+    if (point) {
+      tipElement.insertAdjacentHTML('afterbegin', `${point.label}<br>`);
+    }
 
     // Set position
-    this.elements.display.seekTooltip.style.left = `${percent}%`;
+    tipElement.style.left = `${percent}%`;
 
     // Show/hide the tooltip
     // If the event is a moues in/out and percentage is inside bounds
@@ -795,6 +805,10 @@ const controls = {
       controls.updateTimeDisplay.call(this, this.elements.display.duration, this.duration);
     }
 
+    if (this.config.markers.enabled) {
+      controls.setMarkers.call(this);
+    }
+
     // Update the tooltip (if visible)
     controls.updateSeekTooltip.call(this);
   },
@@ -1123,7 +1137,7 @@ const controls = {
 
     if (is.boolean(input)) {
       show = input;
-    } else if (is.keyboardEvent(input) && input.which === 27) {
+    } else if (is.keyboardEvent(input) && input.key === 'Escape') {
       show = false;
     } else if (is.event(input)) {
       // If Plyr is in a shadowDOM, the event target is set to the component, instead of the
@@ -1511,10 +1525,7 @@ const controls = {
             pane,
             'keydown',
             (event) => {
-              // We only care about <-
+              if (event.key !== 'ArrowLeft') return;
-              if (event.which !== 37) {
-                return;
-              }
 
               // Prevent seek
               event.preventDefault();
@@ -1744,6 +1755,94 @@ const controls = {
       });
     }
   },
+
+  // Set media metadata
+  setMediaMetadata() {
+    try {
+      if ('mediaSession' in navigator) {
+        navigator.mediaSession.metadata = new window.MediaMetadata({
+          title: this.config.mediaMetadata.title,
+          artist: this.config.mediaMetadata.artist,
+          album: this.config.mediaMetadata.album,
+          artwork: this.config.mediaMetadata.artwork,
+        });
+      }
+    } catch (_) {
+      // Do nothing
+    }
+  },
+
+  // Add markers
+  setMarkers() {
+    if (!this.duration || this.elements.markers) return;
+
+    // Get valid points
+    const points = this.config.markers?.points?.filter(({ time }) => time > 0 && time < this.duration);
+    if (!points?.length) return;
+
+    const containerFragment = document.createDocumentFragment();
+    const pointsFragment = document.createDocumentFragment();
+    let tipElement = null;
+    const tipVisible = `${this.config.classNames.tooltip}--visible`;
+    const toggleTip = (show) => toggleClass(tipElement, tipVisible, show);
+
+    // Inject markers to progress container
+    points.forEach((point) => {
+      const markerElement = createElement(
+        'span',
+        {
+          class: this.config.classNames.marker,
+        },
+        '',
+      );
+
+      const left = `${(point.time / this.duration) * 100}%`;
+
+      if (tipElement) {
+        // Show on hover
+        markerElement.addEventListener('mouseenter', () => {
+          if (point.label) return;
+          tipElement.style.left = left;
+          tipElement.innerHTML = point.label;
+          toggleTip(true);
+        });
+
+        // Hide on leave
+        markerElement.addEventListener('mouseleave', () => {
+          toggleTip(false);
+        });
+      }
+
+      markerElement.addEventListener('click', () => {
+        this.currentTime = point.time;
+      });
+
+      markerElement.style.left = left;
+      pointsFragment.appendChild(markerElement);
+    });
+
+    containerFragment.appendChild(pointsFragment);
+
+    // Inject a tooltip if needed
+    if (!this.config.tooltips.seek) {
+      tipElement = createElement(
+        'span',
+        {
+          class: this.config.classNames.tooltip,
+        },
+        '',
+      );
+
+      containerFragment.appendChild(tipElement);
+    }
+
+    this.elements.markers = {
+      points: pointsFragment,
+      tip: tipElement,
+    };
+
+    this.elements.progress.appendChild(containerFragment);
+  },
 };
 
 export default controls;

src/js/fullscreen.js

@@ -124,7 +124,9 @@ class Fullscreen {
       return hasClass(this.target, this.player.config.classNames.fullscreen.fallback);
     }
 
-    const element = !this.prefix ? document.fullscreenElement : document[`${this.prefix}${this.property}Element`];
+    const element = !this.prefix
+      ? this.target.getRootNode().fullscreenElement
+      : this.target.getRootNode()[`${this.prefix}${this.property}Element`];
 
     return element && element.shadowRoot ? element === this.target.getRootNode().host : element === this.target;
   }
@@ -205,7 +207,7 @@ class Fullscreen {
   // 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) {
+    if (browser.isIos || !this.active || event.key !== 'Tab') {
       return;
     }
 

src/js/html5.js

@@ -73,7 +73,7 @@ const html5 = {
           return;
         }
 
-        // If we're using an an external handler...
+        // If we're using an external handler...
         if (player.config.quality.forced && is.function(player.config.quality.onChange)) {
           player.config.quality.onChange(input);
         } else {

src/js/listeners.js

@@ -10,7 +10,7 @@ import { getElement, getElements, matches, toggleClass } from './utils/elements'
 import { off, on, once, toggleListener, triggerEvent } from './utils/events';
 import is from './utils/is';
 import { silencePromise } from './utils/promise';
-import { getAspectRatio, setAspectRatio } from './utils/style';
+import { getAspectRatio, getViewportSize, supportsCSS } from './utils/style';
 
 class Listeners {
   constructor(player) {
@@ -29,25 +29,25 @@ class Listeners {
   handleKey(event) {
     const { player } = this;
     const { elements } = player;
-    const code = event.keyCode ? event.keyCode : event.which;
+    const { key, type, altKey, ctrlKey, metaKey, shiftKey } = event;
-    const pressed = event.type === 'keydown';
+    const pressed = type === 'keydown';
-    const repeat = pressed && code === this.lastKey;
+    const repeat = pressed && key === this.lastKey;
 
     // Bail if a modifier key is set
-    if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) {
+    if (altKey || ctrlKey || metaKey || shiftKey) {
       return;
     }
 
     // If the event is bubbled from the media element
-    // Firefox doesn't get the keycode for whatever reason
+    // Firefox doesn't get the key for whatever reason
-    if (!is.number(code)) {
+    if (!key) {
       return;
     }
 
-    // Seek by the number keys
+    // Seek by increment
-    const seekByKey = () => {
+    const seekByIncrement = (increment) => {
       // 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) * increment;
     };
 
     // Handle the key on keydown
@@ -65,113 +65,114 @@ class Listeners {
           return;
         }
 
-        if (event.which === 32 && matches(focused, 'button, [role^="menuitem"]')) {
+        if (event.key === 'Space' && matches(focused, 'button, [role^="menuitem"]')) {
           return;
         }
       }
 
-      // Which keycodes should we prevent default
+      // Which keys should we prevent default
-      const preventDefault = [32, 37, 38, 39, 40, 48, 49, 50, 51, 52, 53, 54, 56, 57, 67, 70, 73, 75, 76, 77, 79];
+      const preventDefault = [
+        'Space',
+        'ArrowLeft',
+        'ArrowUp',
+        'ArrowRight',
+        'ArrowDown',
 
-      // If the code is found prevent default (e.g. prevent scrolling for arrows)
+        '0',
-      if (preventDefault.includes(code)) {
+        '1',
+        '2',
+        '3',
+        '4',
+        '5',
+        '6',
+        '7',
+        '8',
+        '9',
+
+        'c',
+        'f',
+        'k',
+        'l',
+        'm',
+      ];
+
+      // If the key is found prevent default (e.g. prevent scrolling for arrows)
+      if (preventDefault.includes(key)) {
         event.preventDefault();
         event.stopPropagation();
       }
 
-      switch (code) {
+      switch (key) {
-        case 48:
+        case '0':
-        case 49:
+        case '1':
-        case 50:
+        case '2':
-        case 51:
+        case '3':
-        case 52:
+        case '4':
-        case 53:
+        case '5':
-        case 54:
+        case '6':
-        case 55:
+        case '7':
-        case 56:
+        case '8':
-        case 57:
+        case '9':
-          // 0-9
           if (!repeat) {
-            seekByKey();
+            seekByIncrement(parseInt(key, 10));
           }
           break;
 
-        case 32:
+        case 'Space':
-        case 75:
+        case 'k':
-          // Space and K key
           if (!repeat) {
             silencePromise(player.togglePlay());
           }
           break;
 
-        case 38:
+        case 'ArrowUp':
-          // Arrow up
           player.increaseVolume(0.1);
           break;
 
-        case 40:
+        case 'ArrowDown':
-          // Arrow down
           player.decreaseVolume(0.1);
           break;
 
-        case 77:
+        case 'm':
-          // M key
           if (!repeat) {
             player.muted = !player.muted;
           }
           break;
 
-        case 39:
+        case 'ArrowRight':
-          // Arrow forward
           player.forward();
           break;
 
-        case 37:
+        case 'ArrowLeft':
-          // Arrow back
           player.rewind();
           break;
 
-        case 70:
+        case 'f':
-          // F key
           player.fullscreen.toggle();
           break;
 
-        case 67:
+        case 'c':
-          // C key
           if (!repeat) {
             player.toggleCaptions();
           }
           break;
 
-        case 76:
+        case 'l':
-          // L key
           player.loop = !player.loop;
           break;
 
-        /* case 73:
-                    this.setLoop('start');
-                    break;
-
-                case 76:
-                    this.setLoop();
-                    break;
-
-                case 79:
-                    this.setLoop('end');
-                    break; */
-
         default:
           break;
       }
 
       // Escape is handle natively when in full screen
       // So we only need to worry about non native
-      if (code === 27 && !player.fullscreen.usingNative && player.fullscreen.active) {
+      if (key === 'Escape' && !player.fullscreen.usingNative && player.fullscreen.active) {
         player.fullscreen.toggle();
       }
 
-      // Store last code for next cycle
+      // Store last key for next cycle
-      this.lastKey = code;
+      this.lastKey = key;
     } else {
       this.lastKey = null;
     }
@@ -196,17 +197,18 @@ class Listeners {
   setTabFocus = (event) => {
     const { player } = this;
     const { elements } = player;
+    const { key, type, timeStamp } = event;
 
     clearTimeout(this.focusTimer);
 
     // Ignore any key other than tab
-    if (event.type === 'keydown' && event.which !== 9) {
+    if (type === 'keydown' && key !== 'Tab') {
       return;
     }
 
     // Store reference to event timeStamp
-    if (event.type === 'keydown') {
+    if (type === 'keydown') {
-      this.lastKeyDown = event.timeStamp;
+      this.lastKeyDown = timeStamp;
     }
 
     // Remove current classes
@@ -217,10 +219,10 @@ class Listeners {
     };
 
     // Determine if a key was pressed to trigger this event
-    const wasKeyDown = event.timeStamp - this.lastKeyDown <= 20;
+    const wasKeyDown = timeStamp - this.lastKeyDown <= 20;
 
     // Ignore focus events if a key was pressed prior
-    if (event.type === 'focus' && !wasKeyDown) {
+    if (type === 'focus' && !wasKeyDown) {
       return;
     }
 
@@ -229,7 +231,7 @@ class Listeners {
 
     // Delay the adding of classname until the focus has changed
     // This event fires before the focusin event
-    if (event.type !== 'focusout') {
+    if (type !== 'focusout') {
       this.focusTimer = setTimeout(() => {
         const focused = document.activeElement;
 
@@ -305,39 +307,49 @@ class Listeners {
     );
 
     // Set a gutter for Vimeo
-    const setGutter = (ratio, padding, toggle) => {
+    const setGutter = () => {
       if (!player.isVimeo || player.config.vimeo.premium) {
         return;
       }
 
-      const target = player.elements.wrapper.firstChild;
+      const target = elements.wrapper;
-      const [, y] = ratio;
+      const { active } = player.fullscreen;
-      const [videoX, videoY] = getAspectRatio.call(player);
+      const [videoWidth, videoHeight] = getAspectRatio.call(player);
+      const useNativeAspectRatio = supportsCSS(`aspect-ratio: ${videoWidth} / ${videoHeight}`);
 
-      target.style.maxWidth = toggle ? `${(y / videoY) * videoX}px` : null;
+      // If not active, remove styles
-      target.style.margin = toggle ? '0 auto' : null;
+      if (!active) {
-    };
+        if (useNativeAspectRatio) {
-
+          target.style.width = null;
-    // Resize on fullscreen change
+          target.style.height = null;
-    const setPlayerSize = (measure) => {
+        } else {
-      // If we don't need to measure the viewport
+          target.style.maxWidth = null;
-      if (!measure) {
+          target.style.margin = null;
-        return setAspectRatio.call(player);
+        }
+        return;
       }
 
-      const rect = elements.container.getBoundingClientRect();
+      // Determine which dimension will overflow and constrain view
-      const { width, height } = rect;
+      const [viewportWidth, viewportHeight] = getViewportSize();
+      const overflow = viewportWidth / viewportHeight > videoWidth / videoHeight;
 
-      return setAspectRatio.call(player, `${width}:${height}`);
+      if (useNativeAspectRatio) {
+        target.style.width = overflow ? 'auto' : '100%';
+        target.style.height = overflow ? '100%' : 'auto';
+      } else {
+        target.style.maxWidth = overflow ? `${(viewportHeight / videoHeight) * videoWidth}px` : null;
+        target.style.margin = overflow ? '0 auto' : null;
+      }
     };
 
+    // Handle resizing
     const resized = () => {
       clearTimeout(timers.resized);
-      timers.resized = setTimeout(setPlayerSize, 50);
+      timers.resized = setTimeout(setGutter, 50);
     };
 
     on.call(player, elements.container, 'enterfullscreen exitfullscreen', (event) => {
-      const { target, usingNative } = player.fullscreen;
+      const { target } = player.fullscreen;
 
       // Ignore events not from target
       if (target !== elements.container) {
@@ -349,26 +361,12 @@ class Listeners {
         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);
+      setGutter();
 
-      // Horrible hack for Safari 14 not repainting properly on entering fullscreen
+      // Watch for resizes
-      if (isEnter) {
+      const method = event.type === 'enterfullscreen' ? on : off;
-        setTimeout(() => repaint(elements.container), 100);
+      method.call(player, window, 'resize', resized);
-      }
-
-      // If not using native browser fullscreen API, 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);
-        }
-      }
     });
   };
 
@@ -665,15 +663,12 @@ class Listeners {
       elements.buttons.settings,
       'keyup',
       (event) => {
-        const code = event.which;
+        if (!['Space', 'Enter'].includes(event.key)) {
-
-        // We only care about space and return
-        if (![13, 32].includes(code)) {
           return;
         }
 
         // Because return triggers a click anyway, all we need to do is set focus
-        if (code === 13) {
+        if (event.key === 'Enter') {
           controls.focusFirstMenuItem.call(player, null, true);
           return;
         }
@@ -693,7 +688,7 @@ class Listeners {
 
     // Escape closes menu
     this.bind(elements.settings.menu, 'keydown', (event) => {
-      if (event.which === 27) {
+      if (event.key === 'Escape') {
         controls.toggleMenu.call(player, event);
       }
     });
@@ -708,10 +703,9 @@ class Listeners {
     // Pause while seeking
     this.bind(elements.inputs.seek, 'mousedown mouseup keydown keyup touchstart touchend', (event) => {
       const seek = event.currentTarget;
-      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) && !['ArrowLeft', 'ArrowRight'].includes(event.key)) {
         return;
       }
 
@@ -845,7 +839,9 @@ class Listeners {
         .filter((c) => !c.contains(elements.container))
         .forEach((child) => {
           this.bind(child, 'mouseenter mouseleave', (event) => {
+            if (elements.controls) {
               elements.controls.hover = !player.touch && event.type === 'mouseenter';
+            }
           });
         });
     }
@@ -885,7 +881,7 @@ class Listeners {
       elements.inputs.volume,
       'wheel',
       (event) => {
-        // Detect "natural" scroll - suppored on OS X Safari only
+        // Detect "natural" scroll - supported 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

src/js/plugins/ads.js

@@ -213,8 +213,8 @@ class Ads {
       request.setAdWillPlayMuted(!this.player.muted);
 
       this.loader.requestAds(request);
-    } catch (e) {
+    } catch (error) {
-      this.onAdError(e);
+      this.onAdError(error);
     }
   };
 
@@ -240,7 +240,7 @@ class Ads {
 
   /**
    * This method is called whenever the ads are ready inside the AdDisplayContainer
-   * @param {Event} adsManagerLoadedEvent
+   * @param {Event} event - adsManagerLoadedEvent
    */
   onAdsManagerLoaded = (event) => {
     // Load could occur after a source change (race condition)
@@ -581,6 +581,7 @@ class Ads {
   /**
    * Handles callbacks after an ad event was invoked
    * @param {String} event - Event type
+   * @param args
    */
   trigger = (event, ...args) => {
     const handlers = this.events[event];

src/js/plugins/preview-thumbnails.js

@@ -2,6 +2,7 @@ import { createElement } from '../utils/elements';
 import { once } from '../utils/events';
 import fetch from '../utils/fetch';
 import is from '../utils/is';
+import { clamp } from '../utils/numbers';
 import { formatTime } from '../utils/time';
 
 // Arg: vttDataString example: "WEBVTT\n\n1\n00:00:05.000 --> 00:00:10.000\n1080p-00001.jpg"
@@ -109,9 +110,7 @@ class PreviewThumbnails {
       this.player.elements.display.seekTooltip.hidden = this.enabled;
     }
 
-    if (!this.enabled) {
+    if (!this.enabled) return;
-      return;
-    }
 
     this.getThumbnails().then(() => {
       if (!this.enabled) {
@@ -205,18 +204,12 @@ class PreviewThumbnails {
   };
 
   startMove = (event) => {
-    if (!this.loaded) {
+    if (!this.loaded) return;
-      return;
-    }
 
-    if (!is.event(event) || !['touchmove', 'mousemove'].includes(event.type)) {
+    if (!is.event(event) || !['touchmove', 'mousemove'].includes(event.type)) return;
-      return;
-    }
 
     // Wait until media has a duration
-    if (!this.player.media.duration) {
+    if (!this.player.media.duration) return;
-      return;
-    }
 
     if (event.type === 'touchmove') {
       // Calculate seek hover position as approx video seconds
@@ -241,6 +234,15 @@ class PreviewThumbnails {
 
       // Set time text inside image container
       this.elements.thumb.time.innerText = formatTime(this.seekTime);
+
+      // Get marker point for time
+      const point = this.player.config.markers?.points?.find(({ time: t }) => t === Math.round(this.seekTime));
+
+      // Append the point label to the tooltip
+      if (point) {
+        // this.elements.thumb.time.innerText.concat('\n');
+        this.elements.thumb.time.insertAdjacentHTML('afterbegin', `${point.label}<br>`);
+      }
     }
 
     // Download and show image
@@ -326,7 +328,7 @@ class PreviewThumbnails {
     this.elements.thumb.time = createElement('span', {}, '00:00');
     timeContainer.appendChild(this.elements.thumb.time);
 
-    this.elements.thumb.container.appendChild(timeContainer);
+    this.elements.thumb.imageContainer.appendChild(timeContainer);
 
     // Inject the whole thumb
     if (is.element(this.player.elements.progress)) {
@@ -382,7 +384,7 @@ class PreviewThumbnails {
       }
     });
 
-    // Only proceed if either thumbnum or thumbfilename has changed
+    // Only proceed if either thumb num or thumbfilename has changed
     if (thumbNum !== this.showingThumb) {
       this.showingThumb = thumbNum;
       this.loadImage(qualityIndex);
@@ -553,11 +555,7 @@ class PreviewThumbnails {
   };
 
   get currentImageContainer() {
-    if (this.mouseDown) {
+    return this.mouseDown ? this.elements.scrubbing.container : this.elements.thumb.imageContainer;
-      return this.elements.scrubbing.container;
-    }
-
-    return this.elements.thumb.imageContainer;
   }
 
   get usingSprites() {
@@ -590,11 +588,7 @@ class PreviewThumbnails {
   }
 
   get currentImageElement() {
-    if (this.mouseDown) {
+    return this.mouseDown ? this.currentScrubbingImageElement : this.currentThumbnailImageElement;
-      return this.currentScrubbingImageElement;
-    }
-
-    return this.currentThumbnailImageElement;
   }
 
   set currentImageElement(element) {
@@ -634,46 +628,39 @@ class PreviewThumbnails {
 
   // 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 = () => {
+    const { imageContainer } = this.elements.thumb;
+
     if (!this.sizeSpecifiedInCSS) {
       const thumbWidth = Math.floor(this.thumbContainerHeight * this.thumbAspectRatio);
-      this.elements.thumb.imageContainer.style.height = `${this.thumbContainerHeight}px`;
+      imageContainer.style.height = `${this.thumbContainerHeight}px`;
-      this.elements.thumb.imageContainer.style.width = `${thumbWidth}px`;
+      imageContainer.style.width = `${thumbWidth}px`;
-    } else if (
+    } else if (imageContainer.clientHeight > 20 && imageContainer.clientWidth < 20) {
-      this.elements.thumb.imageContainer.clientHeight > 20 &&
+      const thumbWidth = Math.floor(imageContainer.clientHeight * this.thumbAspectRatio);
-      this.elements.thumb.imageContainer.clientWidth < 20
+      imageContainer.style.width = `${thumbWidth}px`;
-    ) {
+    } else if (imageContainer.clientHeight < 20 && imageContainer.clientWidth > 20) {
-      const thumbWidth = Math.floor(this.elements.thumb.imageContainer.clientHeight * this.thumbAspectRatio);
+      const thumbHeight = Math.floor(imageContainer.clientWidth / this.thumbAspectRatio);
-      this.elements.thumb.imageContainer.style.width = `${thumbWidth}px`;
+      imageContainer.style.height = `${thumbHeight}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 scrubberRect = this.player.elements.progress.getBoundingClientRect();
-    const plyrRect = this.player.elements.container.getBoundingClientRect();
+    const containerRect = 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 min = containerRect.left - scrubberRect.left + 10;
-    const maxVal = plyrRect.right - seekbarRect.left - container.clientWidth - 10;
+    const max = containerRect.right - scrubberRect.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;
+    const position = this.mousePosX - scrubberRect.left - container.clientWidth / 2;
+    const clamped = clamp(position, min, max);
 
-    if (previewPos < minVal) {
+    // Move the popover position
-      previewPos = minVal;
+    container.style.left = `${clamped}px`;
-    }
 
-    if (previewPos > maxVal) {
+    // The arrow can follow the cursor
-      previewPos = maxVal;
+    container.style.setProperty('--preview-arrow-offset', `${position - clamped}px`);
-    }
-
-    container.style.left = `${previewPos}px`;
   };
 
   // Can't use 100% width, in case the video is a different aspect ratio to the video container
@@ -688,9 +675,7 @@ class PreviewThumbnails {
 
   // Sprites need to be offset to the correct location
   setImageSizeAndOffset = (previewImage, frame) => {
-    if (!this.usingSprites) {
+    if (!this.usingSprites) return;
-      return;
-    }
 
     // Find difference between height and preview container height
     const multiplier = this.thumbContainerHeight / frame.h;

src/js/plugins/vimeo.js

@@ -28,6 +28,21 @@ function parseId(url) {
   return url.match(regex) ? RegExp.$2 : url;
 }
 
+// Try to extract a hash for private videos from the URL
+function parseHash(url) {
+  /* This regex matches a hexadecimal hash if given in any of these forms:
+   *  - [https://player.]vimeo.com/video/{id}/{hash}[?params]
+   *  - [https://player.]vimeo.com/video/{id}?h={hash}[&params]
+   *  - [https://player.]vimeo.com/video/{id}?[params]&h={hash}
+   *  - video/{id}/{hash}
+   * If matched, the hash is available in capture group 4
+   */
+  const regex = /^.*(vimeo.com\/|video\/)(\d+)(\?.*&*h=|\/)+([\d,a-f]+)/;
+  const found = url.match(regex);
+
+  return found && found.length === 5 ? found[4] : null;
+}
+
 // Set playback state and trigger change (only on actual change)
 function assurePlaybackState(play) {
   if (play && !this.embed.hasPlayed) {
@@ -71,6 +86,18 @@ const vimeo = {
     const player = this;
     const config = player.config.vimeo;
     const { premium, referrerPolicy, ...frameParams } = config;
+    // Get the source URL or ID
+    let source = player.media.getAttribute('src');
+    let hash = '';
+    // Get from <div> if needed
+    if (is.empty(source)) {
+      source = player.media.getAttribute(player.config.attributes.embed.id);
+      // hash can also be set as attribute on the <div>
+      hash = player.media.getAttribute(player.config.attributes.embed.hash);
+    } else {
+      hash = parseHash(source);
+    }
+    const hashParam = hash ? { h: hash } : {};
 
     // If the owner has a pro or premium account then we can hide controls etc
     if (premium) {
@@ -87,17 +114,11 @@ const vimeo = {
       muted: player.muted,
       gesture: 'media',
       playsinline: !this.config.fullscreen.iosNative,
+      // hash has to be added to iframe-URL
+      ...hashParam,
       ...frameParams,
     });
 
-    // Get the source URL or ID
-    let source = player.media.getAttribute('src');
-
-    // Get from <div> if needed
-    if (is.empty(source)) {
-      source = player.media.getAttribute(player.config.attributes.embed.id);
-    }
-
     const id = parseId(source);
     // Build an iframe
     const iframe = createElement('iframe');

src/js/plyr.d.ts

@@ -211,6 +211,11 @@ declare class Plyr {
    */
   airplay(): void;
 
+  /**
+   * Sets the preview thumbnails for the current source.
+   */
+  setPreviewThumbnails(source: Plyr.PreviewThumbnailsOptions): void;
+
   /**
    * Toggle the controls (video only). Takes optional truthy value to force it on/off.
    */
@@ -238,8 +243,10 @@ declare class Plyr {
 
   /**
    * Destroy lib instance
+   * @param {Function} callback - Callback for when destroy is complete
+   * @param {Boolean} soft - Whether it's a soft destroy (for source changes etc)
    */
-  destroy(): void;
+  destroy(callback?: (...args: any[]) => void, soft?: boolean): void;
 }
 
 declare namespace Plyr {
@@ -265,8 +272,8 @@ declare namespace Plyr {
     controlsshown: PlyrEvent;
     ready: PlyrEvent;
   };
-  // For retrocompatibility, we keep StandadEvent
+  // For retrocompatibility, we keep StandardEvent
-  type StandadEvent = keyof Plyr.StandardEventMap;
+  type StandardEvent = keyof Plyr.StandardEventMap;
   type Html5EventMap = {
     loadstart: PlyrEvent;
     loadeddata: PlyrEvent;
@@ -452,7 +459,7 @@ declare namespace Plyr {
      * 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 };
+    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.
@@ -511,6 +518,16 @@ declare namespace Plyr {
      * Preview Thumbnails Options.
      */
     previewThumbnails?: PreviewThumbnailsOptions;
+
+    /**
+     * Media Metadata Options.
+     */
+    mediaMetadata?: MediaMetadataOptions;
+
+    /**
+     * Markers Options
+     */
+    markers?: MarkersOptions;
   }
 
   interface QualityOptions {
@@ -526,7 +543,8 @@ declare namespace Plyr {
 
   interface AdOptions {
     enabled: boolean;
-    publisherId: string;
+    publisherId?: string;
+    tagUrl?: string;
   }
 
   interface SpeedOptions {
@@ -549,6 +567,7 @@ declare namespace Plyr {
     fallback?: boolean | 'force';
     allowAudio?: boolean;
     iosNative?: boolean;
+    container?: string;
   }
 
   interface CaptionOptions {
@@ -567,6 +586,29 @@ declare namespace Plyr {
     src?: string | string[];
   }
 
+  interface MediaMetadataArtwork {
+    src: string;
+    sizes?: string;
+    type: string;
+  }
+
+  interface MediaMetadataOptions {
+    title?: string;
+    artist?: string;
+    album?: string;
+    artwork?: MediaMetadataArtwork[];
+  }
+
+  interface MarkersPoints {
+    time: number;
+    label: string;
+  }
+
+  interface MarkersOptions {
+    enabled: boolean;
+    points: MarkersPoints[]
+  }
+
   export interface Elements {
     buttons: {
       airplay?: HTMLButtonElement;
@@ -615,6 +657,11 @@ declare namespace Plyr {
      * Booleans are converted to HTML5 value-less attributes.
      */
     tracks?: Track[];
+
+    /**
+     * Enable or disable preview thumbnails for current source
+     */
+    previewThumbnails?: Plyr.PreviewThumbnailsOptions;
   }
 
   interface Source {
@@ -653,7 +700,7 @@ declare namespace Plyr {
   }
 
   interface PlyrEvent extends CustomEvent {
-    readonly detail: { readonly plyr: Plyr };
+    readonly detail: {readonly plyr: Plyr};
   }
 
   enum YoutubeState {

src/js/plyr.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v3.6.6
+// plyr.js v3.7.1
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -72,7 +72,7 @@ class Plyr {
       (() => {
         try {
           return JSON.parse(this.media.getAttribute('data-plyr-config'));
-        } catch (e) {
+        } catch (_) {
           return {};
         }
       })(),
@@ -649,7 +649,7 @@ class Plyr {
 
   /**
    * Set playback speed
-   * @param {Number} speed - the speed of playback (0.5-2.0)
+   * @param {Number} input - the speed of playback (0.5-2.0)
    */
   set speed(input) {
     let speed = null;
@@ -675,7 +675,9 @@ class Plyr {
 
     // Set media speed
     setTimeout(() => {
+      if (this.media) {
         this.media.playbackRate = speed;
+      }
     }, 0);
   }
 
@@ -931,8 +933,7 @@ class Plyr {
    * @param {Boolean} input - Whether to autoplay or not
    */
   set autoplay(input) {
-    const toggle = is.boolean(input) ? input : this.config.autoplay;
+    this.config.autoplay = is.boolean(input) ? input : this.config.autoplay;
-    this.config.autoplay = toggle;
   }
 
   /**
@@ -952,10 +953,11 @@ class Plyr {
 
   /**
    * Set the caption track by index
-   * @param {Number} - Caption index
+   * @param {Number} input - Caption index
    */
   set currentTrack(input) {
     captions.set.call(this, input, false);
+    captions.setup.call(this);
   }
 
   /**
@@ -969,7 +971,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} input - Two character ISO language code (e.g. EN, FR, PT, etc)
    */
   set language(input) {
     captions.setLanguage.call(this, input, false);
@@ -1029,6 +1031,23 @@ class Plyr {
     return this.media === document.pictureInPictureElement;
   }
 
+  /**
+   * Sets the preview thubmnails for the current source
+   */
+  setPreviewThumbnails(thumbnailSource) {
+    if (this.previewThumbnails && this.previewThumbnails.loaded) {
+      this.previewThumbnails.destroy();
+      this.previewThumbnails = null;
+    }
+
+    Object.assign(this.config.previewThumbnails, thumbnailSource);
+
+    // Create new instance if it is still enabled
+    if (this.config.previewThumbnails.enabled) {
+      this.previewThumbnails = new PreviewThumbnails(this);
+    }
+  }
+
   /**
    * Trigger the airplay dialog
    * TODO: update player with state, support, enabled

src/js/plyr.polyfilled.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr Polyfilled Build
-// plyr.js v3.6.6
+// plyr.js v3.7.1
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================

src/js/storage.js

@@ -26,7 +26,7 @@ class Storage {
       window.localStorage.removeItem(test);
 
       return true;
-    } catch (e) {
+    } catch (_) {
       return false;
     }
   }
@@ -70,7 +70,11 @@ class Storage {
     extend(storage, object);
 
     // Update storage
+    try {
       window.localStorage.setItem(this.key, JSON.stringify(storage));
+    } catch (_) {
+      // Do nothing
+    }
   };
 }
 

src/js/support.js

@@ -88,7 +88,7 @@ const support = {
 
     try {
       return Boolean(type && this.media.canPlayType(type).replace(/no/, ''));
-    } catch (e) {
+    } catch (_) {
       return false;
     }
   },

src/js/ui.js

@@ -82,6 +82,9 @@ const ui = {
     // Reset time display
     controls.timeUpdate.call(this);
 
+    // Reset duration display
+    controls.durationUpdate.call(this);
+
     // Update the UI
     ui.checkPlaying.call(this);
 
@@ -122,6 +125,11 @@ const ui = {
     if (this.config.duration) {
       controls.durationUpdate.call(this);
     }
+
+    // Media metadata
+    if (this.config.mediaMetadata) {
+      controls.setMediaMetadata.call(this);
+    }
   },
 
   // Setup aria attribute for play and iframe title
@@ -181,13 +189,13 @@ const ui = {
         .call(this)
         // Load image
         .then(() => loadImage(poster))
-        .catch((err) => {
+        .catch((error) => {
           // Hide poster on error unless it's been set by another call
           if (poster === this.poster) {
             ui.togglePoster.call(this, false);
           }
           // Rethrow
-          throw err;
+          throw error;
         })
         .then(() => {
           // Prevent race conditions

src/js/utils/animation.js

@@ -31,7 +31,7 @@ export function repaint(element, delay) {
 
       // eslint-disable-next-line no-param-reassign
       element.hidden = false;
-    } catch (e) {
+    } catch (_) {
       // Do nothing
     }
   }, delay);

src/js/utils/browser.js

@@ -8,7 +8,9 @@ const browser = {
   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),
+  isIos:
+    (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1) ||
+    /(iPad|iPhone|iPod)/gi.test(navigator.platform),
 };
 
 export default browser;

src/js/utils/events.js

@@ -19,7 +19,7 @@ const supportsPassiveListeners = (() => {
     });
     window.addEventListener('test', null, options);
     window.removeEventListener('test', null, options);
-  } catch (e) {
+  } catch (_) {
     // Do nothing
   }
 

src/js/utils/fetch.js

@@ -17,7 +17,7 @@ export default function fetch(url, responseType = 'text') {
         if (responseType === 'text') {
           try {
             resolve(JSON.parse(request.responseText));
-          } catch (e) {
+          } catch (_) {
             resolve(request.responseText);
           }
         } else {
@@ -35,8 +35,8 @@ export default function fetch(url, responseType = 'text') {
       request.responseType = responseType;
 
       request.send();
-    } catch (e) {
+    } catch (error) {
-      reject(e);
+      reject(error);
     }
   });
 }

src/js/utils/is.js

@@ -51,7 +51,7 @@ const isUrl = (input) => {
 
   try {
     return !isEmpty(new URL(string).hostname);
-  } catch (e) {
+  } catch (_) {
     return false;
   }
 };

src/js/utils/load-sprite.js

@@ -60,12 +60,16 @@ export default function loadSprite(url, id) {
         }
 
         if (useStorage) {
+          try {
             window.localStorage.setItem(
               `${prefix}-${id}`,
               JSON.stringify({
                 content: result,
               }),
             );
+          } catch (_) {
+            // Do nothing
+          }
         }
 
         update(container, result);

src/js/utils/numbers.js

@@ -7,7 +7,7 @@
  * @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]
+ * @returns A number within the bounds of min and max
  * @type Number
  */
 export function clamp(input = 0, min = 0, max = 255) {

src/js/utils/strings.js

@@ -11,9 +11,7 @@ export function generateId(prefix) {
 
 // Format string
 export function format(input, ...args) {
-  if (is.empty(input)) {
+  if (is.empty(input)) return input;
-    return input;
-  }
 
   return input.toString().replace(/{(\d+)}/g, (match, i) => args[i].toString());
 }
@@ -27,13 +25,13 @@ export function getPercentage(current, max) {
   return ((current / max) * 100).toFixed(2);
 }
 
-// Replace all occurances of a string in a string
+// Replace all occurrences of a string in a string
 export const replaceAll = (input = '', find = '', replace = '') =>
   input.replace(new RegExp(find.toString().replace(/([.*+?^=!:${}()|[\]/\\])/g, '\\$1'), 'g'), replace.toString());
 
 // Convert to title case
 export const toTitleCase = (input = '') =>
-  input.toString().replace(/\w\S*/g, (text) => text.charAt(0).toUpperCase() + text.substr(1).toLowerCase());
+  input.toString().replace(/\w\S*/g, (text) => text.charAt(0).toUpperCase() + text.slice(1).toLowerCase());
 
 // Convert string to pascalCase
 export function toPascalCase(input = '') {

src/js/utils/style.js

@@ -5,6 +5,15 @@
 import { closest } from './arrays';
 import is from './is';
 
+// Check support for a CSS declaration
+export function supportsCSS(declaration) {
+  if (!window || !window.CSS) {
+    return false;
+  }
+
+  return window.CSS.supports(declaration);
+}
+
 // Standard/common aspect ratios
 const standardRatios = [
   [1, 1],
@@ -67,10 +76,10 @@ export function getAspectRatio(input) {
   // Get from HTML5 video
   if (ratio === null && this.isHTML5) {
     const { videoWidth, videoHeight } = this.media;
-    ratio = reduceAspectRatio([videoWidth, videoHeight]);
+    ratio = [videoWidth, videoHeight];
   }
 
-  return ratio;
+  return reduceAspectRatio(ratio);
 }
 
 // Set aspect ratio for responsive container
@@ -86,8 +95,8 @@ export function setAspectRatio(input) {
     return {};
   }
 
-  const [x, y] = ratio;
+  const [x, y] = reduceAspectRatio(ratio);
-  const useNative = window.CSS?.supports(`aspect-ratio: ${x} / ${y}`) ?? false;
+  const useNative = supportsCSS(`aspect-ratio: ${x}/${y}`);
   const padding = (100 / x) * y;
 
   if (useNative) {
@@ -107,7 +116,7 @@ export function setAspectRatio(input) {
       this.media.style.transform = `translateY(-${offset}%)`;
     }
   } else if (this.isHTML5) {
-    wrapper.classList.toggle(this.config.classNames.videoFixedRatio, ratio !== null);
+    wrapper.classList.add(this.config.classNames.videoFixedRatio);
   }
 
   return { padding, ratio };
@@ -127,4 +136,10 @@ export function roundAspectRatio(x, y, tolerance = 0.05) {
   return [x, y];
 }
 
-export default { setAspectRatio };
+// Get the size of the viewport
+// https://stackoverflow.com/questions/1248081/how-to-get-the-browser-viewport-dimensions
+export function getViewportSize() {
+  const width = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0);
+  const height = Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0);
+  return [width, height];
+}

src/js/utils/urls.js

@@ -20,7 +20,7 @@ export function parseUrl(input, safe = true) {
 
   try {
     return new URL(url);
-  } catch (e) {
+  } catch (_) {
     return null;
   }
 }

src/sass/base.scss

@@ -5,6 +5,7 @@
 // Base
 .plyr {
   @include plyr-font-smoothing($plyr-font-smoothing);
+
   align-items: center;
   direction: ltr;
   display: flex;

src/sass/components/control.scss

@@ -29,7 +29,7 @@
 
   // Tab focus
   &.plyr__tab-focus {
-    @include plyr-tab-focus();
+    @include plyr-tab-focus;
   }
 }
 

src/sass/components/controls.scss

@@ -56,6 +56,7 @@
 .plyr [data-plyr='fullscreen'] {
   display: none;
 }
+
 .plyr--captions-enabled [data-plyr='captions'],
 .plyr--pip-supported [data-plyr='pip'],
 .plyr--airplay-supported [data-plyr='airplay'],

src/sass/components/menus.scss

@@ -10,6 +10,7 @@
   .plyr__control svg {
     transition: transform 0.3s ease;
   }
+
   .plyr__control[aria-expanded='true'] {
     svg {
       transform: rotate(90deg);
@@ -73,10 +74,7 @@
       color: $plyr-menu-color;
       display: flex;
       font-size: $plyr-font-size-menu;
-      padding-bottom: calc(#{$plyr-control-padding} / 1.5);
+      padding: calc(#{$plyr-control-padding} / 1.5) calc(#{$plyr-control-padding} * 1.5);
-      padding-left: calc(#{$plyr-control-padding} * 1.5);
-      padding-right: calc(#{$plyr-control-padding} * 1.5);
-      padding-top: calc(#{$plyr-control-padding} / 1.5);
       user-select: none;
       width: 100%;
 
@@ -176,6 +174,7 @@
         &::before {
           background: $plyr-control-toggle-checked-background;
         }
+
         &::after {
           opacity: 1;
           transform: translateY(-50%) scale(1);

src/sass/components/progress.scss

@@ -24,8 +24,10 @@ $plyr-progress-offset: $plyr-range-thumb-height;
 
   // Seek tooltip to show time
   .plyr__tooltip {
-    font-size: $plyr-font-size-time;
     left: 0;
+    max-width: 120px;
+    overflow-wrap: break-word;
+    white-space: normal;
   }
 }
 
@@ -92,3 +94,15 @@ $plyr-progress-offset: $plyr-range-thumb-height;
 .plyr--audio.plyr--loading .plyr__progress__buffer {
   background-color: $plyr-audio-progress-buffered-background;
 }
+
+// Markers
+.plyr__progress__marker {
+  background-color: $plyr-progress-marker-background;
+  border-radius: 1px;
+  height: $plyr-range-track-height;
+  position: absolute;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  width: $plyr-progress-marker-width;
+  z-index: 3;
+}

src/sass/components/sliders.scss

@@ -3,10 +3,11 @@
 // --------------------------------------------------------------
 
 .plyr--full-ui input[type='range'] {
-  -webkit-appearance: none; /* stylelint-disable-line */
+  appearance: none;
   background: transparent;
   border: 0;
   border-radius: calc(#{$plyr-range-thumb-height} * 2);
+
   // `color` property is used in JS to populate lower fill for WebKit
   color: $plyr-range-fill-background;
   display: block;
@@ -18,23 +19,25 @@
   width: 100%;
 
   &::-webkit-slider-runnable-track {
-    @include plyr-range-track();
+    @include plyr-range-track;
+
     background-image: linear-gradient(to right, currentColor var(--value, 0%), transparent var(--value, 0%));
   }
 
   &::-webkit-slider-thumb {
-    @include plyr-range-thumb();
+    @include plyr-range-thumb;
-    -webkit-appearance: none; /* stylelint-disable-line */
+
+    appearance: none;
     margin-top: calc(((#{$plyr-range-thumb-height} - #{$plyr-range-track-height}) / 2) * -1);
   }
 
   // Mozilla
   &::-moz-range-track {
-    @include plyr-range-track();
+    @include plyr-range-track;
   }
 
   &::-moz-range-thumb {
-    @include plyr-range-thumb();
+    @include plyr-range-thumb;
   }
 
   &::-moz-range-progress {
@@ -45,22 +48,24 @@
 
   // Microsoft
   &::-ms-track {
-    @include plyr-range-track();
+    @include plyr-range-track;
+
     color: transparent;
   }
 
   &::-ms-fill-upper {
-    @include plyr-range-track();
+    @include plyr-range-track;
   }
 
   &::-ms-fill-lower {
-    @include plyr-range-track();
+    @include plyr-range-track;
 
     background: currentColor;
   }
 
   &::-ms-thumb {
-    @include plyr-range-thumb();
+    @include plyr-range-thumb;
+
     // For some reason, Edge uses the -webkit margin above
     margin-top: 0;
   }
@@ -70,25 +75,25 @@
   }
 
   // Focus styles
-  &:focus {
-    outline: 0;
-  }
-
   &::-moz-focus-outer {
     border: 0;
   }
 
+  &:focus {
+    outline: 0;
+  }
+
   &.plyr__tab-focus {
     &::-webkit-slider-runnable-track {
-      @include plyr-tab-focus();
+      @include plyr-tab-focus;
     }
 
     &::-moz-range-track {
-      @include plyr-tab-focus();
+      @include plyr-tab-focus;
     }
 
     &::-ms-track {
-      @include plyr-tab-focus();
+      @include plyr-tab-focus;
     }
   }
 }

src/sass/components/tooltips.scss

@@ -1,3 +1,4 @@
+/* stylelint-disable selector-max-compound-selectors */
 // --------------------------------------------------------------
 // Tooltips
 // --------------------------------------------------------------

src/sass/lib/css-vars.scss

@@ -1,5 +1,8 @@
 // Downloaded from https://github.com/malyw/css-vars (and modified)
 
+@use 'sass:list';
+@use 'sass:map';
+
 // global map to be filled via variables
 $css-vars: ();
 
@@ -21,36 +24,35 @@ $css-vars-use-native: false !default;
 
 ///
 // Emulates var() CSS native function behavior
-//
 // $args[0] {String} "--" + variable name
 // [$args[1]] Optional default value if variable is not assigned yet
-//
 // E.G.:
 // color: var(--main-color);
 // background: var(--main-background, green);
 ///
 @function var($args...) {
   // CHECK PARAMS
-  @if (length($args) ==0) {
+  @if length($args) == 0 {
     @error 'Variable name is expected to be passed to the var() function';
   }
-  @if (str-length(nth($args, 1)) < 2 or str-slice(nth($args, 1), 0, 2) != '--') {
+
+  @if str-length(nth($args, 1)) < 2 or str-slice(nth($args, 1), 0, 2) != '--' {
     @error "Variable name is expected to start from '--'";
   }
 
   // PROCESS
-  $var-name: nth($args, 1);
+  $var-name: list.nth($args, 1);
-  $var-value: map-get($css-vars, $var-name);
+  $var-value: map.get($css-vars, $var-name);
 
-  @if ($css-vars-use-native) {
+  @if $css-vars-use-native {
     // CSS variables
     // Native CSS: don't process function in case of native
     @return unquote('var(' + $args + ')');
   } @else {
-    @if ($var-value == null) {
+    @if not $var-value {
       // variable is not provided so far
-      @if (length($args) == 2) {
+      @if length($args) == 2 {
-        $var-value: nth($args, 2);
+        $var-value: list.nth($args, 2);
       }
     }
 
@@ -60,7 +62,7 @@ $css-vars-use-native: false !default;
 }
 
 ///
-// SASS mixin to provide variables
+// Sass mixin to provide variables
 // E.G.:
 // @include css-vars((
 //    --color: rebeccapurple,
@@ -70,20 +72,21 @@ $css-vars-use-native: false !default;
 ///
 @mixin css-vars($var-map: null) {
   // CHECK PARAMS
-  @if ($var-map == null) {
+  @if not $var-map {
     @error 'Map of variables is expected, instead got: null';
   }
-  @if (type_of($var-map) != map) {
+
+  @if type_of($var-map) != map {
     @error 'Map of variables is expected, instead got another type passed: #{type_of($var, ap)}';
   }
 
   // PROCESS
-  @if ($css-vars-use-native) {
+  @if $css-vars-use-native {
     // CSS variables
     // Native CSS: assign CSS custom properties to the global scope
     @at-root :root {
       @each $var-name, $var-value in $var-map {
-        @if (type_of($var-value) == string) {
+        @if type_of($var-value) == string {
           #{$var-name}: $var-value; // to prevent quotes interpolation
         } @else {
           #{$var-name}: #{$var-value};

src/sass/lib/functions.scss

@@ -1,7 +1,3 @@
-// ==========================================================================
-// Useful functions
-// ==========================================================================
-
 @function to-percentage($input) {
   @return $input * 1%;
 }

src/sass/lib/mixins.scss

@@ -5,10 +5,8 @@
 // Nicer focus styles
 // ---------------------------------------
 @mixin plyr-tab-focus($color: $plyr-tab-focus-color) {
-  outline-color: $color;
+  outline: $color dotted 3px;
   outline-offset: 2px;
-  outline-style: dotted;
-  outline-width: 3px;
 }
 
 // Font smoothing
@@ -59,17 +57,6 @@
     height: 100%;
   }
 
-  .plyr__video-wrapper {
-    height: 100%;
-    position: static;
-  }
-
-  // Vimeo requires some different styling
-  &.plyr--vimeo .plyr__video-wrapper {
-    height: 0;
-    position: relative;
-  }
-
   // Display correct icon
   .plyr__control .icon--exit-fullscreen {
     display: block;

src/sass/plugins/ads.scss

@@ -36,7 +36,7 @@
     z-index: 3;
   }
 
-  &::after:empty {
+  &:empty::after {
     display: none;
   }
 }
@@ -47,10 +47,10 @@
   display: block;
   height: $plyr-range-track-height;
   left: 0;
-  margin: -($plyr-range-track-height / 2) 0 0;
   opacity: 0.8;
   position: absolute;
   top: 50%;
+  transform: translateY(-50%);
   width: 3px;
   z-index: 3; // Between progress and thumb
 }

src/sass/plugins/preview-thumbnails/index.scss

@@ -6,12 +6,12 @@
 
 .plyr__preview-thumb {
   background-color: $plyr-preview-background;
-  border-radius: 3px;
+  border-radius: $plyr-preview-radius;
   bottom: 100%;
   box-shadow: $plyr-preview-shadow;
   margin-bottom: calc(#{$plyr-preview-padding} * 2);
   opacity: 0;
-  padding: $plyr-preview-radius;
+  padding: 3px;
   pointer-events: none;
   position: absolute;
   transform: translate(0, 10px) scale(0.8);
@@ -32,7 +32,7 @@
     bottom: calc(#{$plyr-preview-arrow-size} * -1);
     content: '';
     height: 0;
-    left: 50%;
+    left: calc(50% + var(--preview-arrow-offset));
     position: absolute;
     transform: translateX(-50%);
     width: 0;
@@ -46,32 +46,45 @@
     position: relative;
     z-index: 0;
 
-    img {
+    img,
-      height: 100%; // Non sprite images are 100%. Sprites will have their size applied by JavaScript
+    &::after {
+      height: 100%;
       left: 0;
-      max-height: none;
-      max-width: none;
       position: absolute;
       top: 0;
       width: 100%;
     }
+
+    &::after {
+      border-radius: inherit;
+      box-shadow: inset 0 0 0 1px rgba(#000, 15%);
+      content: '';
+      pointer-events: none;
+    }
+
+    img {
+      // Non sprite images are 100%. Sprites will have their size applied by JavaScript
+      max-height: none;
+      max-width: none;
+    }
   }
 
   // Seek time text
   &__time-container {
-    bottom: $plyr-preview-time-bottom-offset;
+    background: $plyr-preview-time-container-background;
+    border-bottom-left-radius: calc(#{$plyr-preview-radius} - 1px);
+    border-bottom-right-radius: calc(#{$plyr-preview-radius} - 1px);
+    bottom: 0;
     left: 0;
+    line-height: 1.1;
+    padding: $plyr-preview-time-container-padding;
     position: absolute;
     right: 0;
-    white-space: nowrap;
     z-index: 3;
 
     span {
-      background-color: $plyr-preview-time-background;
-      border-radius: calc(#{$plyr-preview-radius} - 1px);
       color: $plyr-preview-time-color;
       font-size: $plyr-preview-time-font-size;
-      padding: $plyr-preview-time-padding;
     }
   }
 }

src/sass/plugins/preview-thumbnails/settings.scss

@@ -8,8 +8,10 @@ $plyr-preview-radius: $plyr-tooltip-radius !default;
 $plyr-preview-shadow: $plyr-tooltip-shadow !default;
 $plyr-preview-arrow-size: $plyr-tooltip-arrow-size !default;
 $plyr-preview-image-background: $plyr-color-gray-200 !default;
-$plyr-preview-time-font-size: $plyr-font-size-time !default;
+$plyr-preview-time-container-background: var(
-$plyr-preview-time-padding: 3px 6px !default;
+  --plyr-video-controls-background,
-$plyr-preview-time-background: rgba(0, 0, 0, 0.55);
+  linear-gradient(rgba(#000, 0), rgba(#000, 0.75))
+) !default;
+$plyr-preview-time-container-padding: 20px 6px 6px !default;
 $plyr-preview-time-color: #fff;
-$plyr-preview-time-bottom-offset: 6px;
+$plyr-preview-time-font-size: $plyr-font-size-time !default;

src/sass/plyr.scss

@@ -1,18 +1,19 @@
+@charset "UTF-8";
+
 // ==========================================================================
 // Plyr styles
 // https://github.com/sampotts/plyr
 // TODO: Review use of BEM classnames
 // ==========================================================================
-@charset 'UTF-8';
 
 @import 'lib/css-vars';
+
 $css-vars-use-native: true;
 
 @import 'settings/breakpoints';
 @import 'settings/colors';
 @import 'settings/cosmetics';
 @import 'settings/type';
-
 @import 'settings/badges';
 @import 'settings/captions';
 @import 'settings/controls';
@@ -21,13 +22,10 @@ $css-vars-use-native: true;
 @import 'settings/progress';
 @import 'settings/sliders';
 @import 'settings/tooltips';
-
 @import 'lib/animation';
 @import 'lib/functions';
 @import 'lib/mixins';
-
 @import 'base';
-
 @import 'components/badges';
 @import 'components/captions';
 @import 'components/control';
@@ -39,14 +37,10 @@ $css-vars-use-native: true;
 @import 'components/tooltips';
 @import 'components/progress';
 @import 'components/volume';
-
 @import 'types/audio';
 @import 'types/video';
-
 @import 'states/fullscreen';
-
 @import 'plugins/ads';
 @import 'plugins/preview-thumbnails/index';
-
 @import 'utils/animation';
 @import 'utils/hidden';

src/sass/settings/captions.scss

@@ -4,7 +4,6 @@
 
 $plyr-captions-background: var(--plyr-captions-background, rgba(#000, 0.8)) !default;
 $plyr-captions-text-color: var(--plyr-captions-text-color, #fff) !default;
-
 $plyr-font-size-captions-base: $plyr-font-size-base !default;
 $plyr-font-size-captions-small: $plyr-font-size-small !default;
 $plyr-font-size-captions-medium: $plyr-font-size-large !default;

src/sass/settings/colors.scss

@@ -2,17 +2,17 @@
 // Colors
 // ==========================================================================
 
-$plyr-color-main: var(--plyr-color-main, hsl(198, 100%, 50%)) !default;
+$plyr-color-main: var(--plyr-color-main, hsl(198deg 100% 50%)) !default;
-$plyr-video-background: var(--plyr-video-background, rgba(0,0,0,1)) !default;
+$plyr-video-background: var(--plyr-video-background, rgb(0 0 0 / 100%)) !default;
 
 // Grayscale
-$plyr-color-gray-900: hsl(216, 15%, 16%) !default;
+$plyr-color-gray-900: hsl(216deg 15% 16%) !default;
-$plyr-color-gray-800: hsl(216, 15%, 25%) !default;
+$plyr-color-gray-800: hsl(216deg 15% 25%) !default;
-$plyr-color-gray-700: hsl(216, 15%, 34%) !default;
+$plyr-color-gray-700: hsl(216deg 15% 34%) !default;
-$plyr-color-gray-600: hsl(216, 15%, 43%) !default;
+$plyr-color-gray-600: hsl(216deg 15% 43%) !default;
-$plyr-color-gray-500: hsl(216, 15%, 52%) !default;
+$plyr-color-gray-500: hsl(216deg 15% 52%) !default;
-$plyr-color-gray-400: hsl(216, 15%, 61%) !default;
+$plyr-color-gray-400: hsl(216deg 15% 61%) !default;
-$plyr-color-gray-300: hsl(216, 15%, 70%) !default;
+$plyr-color-gray-300: hsl(216deg 15% 70%) !default;
-$plyr-color-gray-200: hsl(216, 15%, 79%) !default;
+$plyr-color-gray-200: hsl(216deg 15% 79%) !default;
-$plyr-color-gray-100: hsl(216, 15%, 88%) !default;
+$plyr-color-gray-100: hsl(216deg 15% 88%) !default;
-$plyr-color-gray-50: hsl(216, 15%, 97%) !default;
+$plyr-color-gray-50: hsl(216deg 15% 97%) !default;

src/sass/settings/controls.scss

@@ -7,12 +7,10 @@ $plyr-control-spacing: var(--plyr-control-spacing, 10px) !default;
 $plyr-control-padding: calc(#{$plyr-control-spacing} * 0.7);
 $plyr-control-padding: var(--plyr-control-padding, $plyr-control-padding) !default;
 $plyr-control-radius: var(--plyr-control-radius, 3px) !default;
-
 $plyr-control-toggle-checked-background: var(
   --plyr-control-toggle-checked-background,
   var(--plyr-color-main, $plyr-color-main)
 ) !default;
-
 $plyr-video-controls-background: var(
   --plyr-video-controls-background,
   linear-gradient(rgba(#000, 0), rgba(#000, 0.75))
@@ -23,7 +21,6 @@ $plyr-video-control-background-hover: var(
   --plyr-video-control-background-hover,
   var(--plyr-color-main, $plyr-color-main)
 ) !default;
-
 $plyr-audio-controls-background: var(--plyr-audio-controls-background, #fff) !default;
 $plyr-audio-control-color: var(--plyr-audio-control-color, $plyr-color-gray-700) !default;
 $plyr-audio-control-color-hover: var(--plyr-audio-control-color-hover, #fff) !default;

src/sass/settings/menus.scss

@@ -7,9 +7,7 @@ $plyr-menu-radius: var(--plyr-menu-radius, 4px) !default;
 $plyr-menu-color: var(--plyr-menu-color, $plyr-color-gray-700) !default;
 $plyr-menu-shadow: var(--plyr-menu-shadow, 0 1px 2px rgba(#000, 0.15)) !default;
 $plyr-menu-arrow-size: var(--plyr-menu-arrow-size, 4px) !default;
-
 $plyr-menu-item-arrow-size: var(--plyr-menu-item-arrow-size, 4px) !default;
 $plyr-menu-item-arrow-color: var(--plyr-menu-arrow-color, $plyr-color-gray-500) !default;
-
 $plyr-menu-back-border-color: var(--plyr-menu-back-border-color, $plyr-color-gray-100) !default;
 $plyr-menu-back-border-shadow-color: var(--plyr-menu-back-border-shadow-color, #fff) !default;

src/sass/settings/progress.scss

@@ -6,6 +6,10 @@
 $plyr-progress-loading-size: var(--plyr-progress-loading-size, 25px) !default;
 $plyr-progress-loading-background: var(--plyr-progress-loading-background, rgba($plyr-color-gray-900, 0.6)) !default;
 
+// Markers
+$plyr-progress-marker-background: var(--plyr-progress-marker-background, #fff) !default;
+$plyr-progress-marker-width: var(--plyr-progress-marker-width, 3px) !default;
+
 // Buffered
 $plyr-video-progress-buffered-background: var(--plyr-video-progress-buffered-background, rgba(#fff, 0.25)) !default;
 $plyr-audio-progress-buffered-background: var(

src/sass/settings/sliders.scss

@@ -29,7 +29,6 @@ $plyr-video-range-thumb-active-shadow-color: var(
   --plyr-audio-range-thumb-active-shadow-color,
   rgba(#fff, 0.5)
 ) !default;
-
 $plyr-audio-range-track-background: var(
   --plyr-audio-range-track-background,
   $plyr-audio-progress-buffered-background

src/sass/settings/tooltips.scss

@@ -7,5 +7,5 @@ $plyr-tooltip-color: var(--plyr-tooltip-color, $plyr-color-gray-700) !default;
 $plyr-tooltip-padding: calc(#{$plyr-control-spacing} / 2);
 $plyr-tooltip-padding: var(--plyr-tooltip-padding, $plyr-tooltip-padding) !default;
 $plyr-tooltip-arrow-size: var(--plyr-tooltip-arrow-size, 4px) !default;
-$plyr-tooltip-radius: var(--plyr-tooltip-radius, 3px) !default;
+$plyr-tooltip-radius: var(--plyr-tooltip-radius, 5px) !default;
 $plyr-tooltip-shadow: var(--plyr-tooltip-shadow, 0 1px 2px rgba(0, 0, 0, 0.15)) !default;

src/sass/settings/type.scss

@@ -7,14 +7,10 @@ $plyr-font-size-base: var(--plyr-font-size-base, 15px) !default;
 $plyr-font-size-small: var(--plyr-font-size-small, 13px) !default;
 $plyr-font-size-large: var(--plyr-font-size-large, 18px) !default;
 $plyr-font-size-xlarge: var(--plyr-font-size-xlarge, 21px) !default;
-
 $plyr-font-size-time: var(--plyr-font-size-time, $plyr-font-size-small) !default;
 $plyr-font-size-menu: var(--plyr-font-size-menu, $plyr-font-size-small) !default;
 $plyr-font-size-badge: var(--plyr-font-size-badge, 9px) !default;
-
 $plyr-font-weight-regular: var(--plyr-font-weight-regular, 400) !default;
 $plyr-font-weight-bold: var(--plyr-font-weight-bold, 600) !default;
-
 $plyr-line-height: var(--plyr-line-height, 1.7) !default;
-
 $plyr-font-smoothing: var(--plyr-font-smoothing, false) !default;

src/sass/states/fullscreen.scss

@@ -3,27 +3,13 @@
 // --------------------------------------------------------------
 
 .plyr:fullscreen {
-  @include plyr-fullscreen-active();
+  @include plyr-fullscreen-active;
-}
-
-/* stylelint-disable-next-line */
-.plyr:-webkit-full-screen {
-  @include plyr-fullscreen-active();
-}
-
-/* stylelint-disable-next-line */
-.plyr:-moz-full-screen {
-  @include plyr-fullscreen-active();
-}
-
-/* stylelint-disable-next-line */
-.plyr:-ms-fullscreen {
-  @include plyr-fullscreen-active();
 }
 
 // Fallback for unsupported browsers
 .plyr--fullscreen-fallback {
-  @include plyr-fullscreen-active();
+  @include plyr-fullscreen-active;
+
   bottom: 0;
   display: block;
   left: 0;

src/sass/types/video.scss

@@ -2,6 +2,8 @@
 // Video styles
 // --------------------------------------------------------------
 
+@use 'sass:math';
+
 // Container
 .plyr--video {
   background: var(--plyr-video-background, $plyr-video-background);
@@ -22,7 +24,7 @@
 }
 
 // Default to 16:9 ratio but this is set by JavaScript based on config
-$embed-padding: ((100 / 16) * 9);
+$embed-padding: (math.div(100, 16) * 9);
 
 .plyr__video-embed,
 .plyr__video-wrapper--fixed-ratio {
@@ -45,17 +47,14 @@ $embed-padding: ((100 / 16) * 9);
   width: 100%;
 }
 
-// If the full custom UI is supported
+// For Vimeo, if the full custom UI is supported
-.plyr--full-ui .plyr__video-embed {
+.plyr--full-ui .plyr__video-embed > .plyr__video-embed__container {
   $height: 240;
-  $offset: to-percentage(($height - $embed-padding) / ($height / 50));
+  $offset: to-percentage(math.div($height - $embed-padding, math.div($height, 50)));
 
-  // Only used for Vimeo
-  > .plyr__video-embed__container {
   padding-bottom: to-percentage($height);
   position: relative;
   transform: translateY(-$offset);
-  }
 }
 
 // Controls container

tasks/build.js

@@ -13,7 +13,7 @@ const babel = require('rollup-plugin-babel');
 const commonjs = require('rollup-plugin-commonjs');
 const resolve = require('rollup-plugin-node-resolve');
 // CSS
-const sass = require('gulp-sass');
+const sass = require('gulp-sass')(require('sass'));
 const postcss = require('gulp-postcss');
 const autoprefixer = require('autoprefixer');
 const cssnano = require('cssnano');

tasks/deploy.js

@@ -51,11 +51,19 @@ const paths = {
   ],
 };
 
-// Get branch info
+// Get git branch info
+const currentBranch = (() => {
+  try {
+    return gitbranch.sync();
+  } catch (_) {
+    return null;
+  }
+})();
+
 const branch = {
-  current: gitbranch.sync(),
+  current: currentBranch,
-  master: 'master',
+  isMaster: currentBranch === 'master',
-  beta: 'beta',
+  isBeta: currentBranch === 'beta',
 };
 
 const maxAge = 31536000; // 1 year
@@ -66,7 +74,7 @@ const options = {
     },
   },
   demo: {
-    uploadPath: branch.current === branch.beta ? '/beta' : null,
+    uploadPath: branch.isBeta ? '/beta' : null,
     headers: {
       'Cache-Control': 'no-cache, no-store, must-revalidate, max-age=0',
     },
@@ -99,11 +107,8 @@ const renameFile = rename((p) => {
 
 // Check we're on the correct branch to deploy
 const canDeploy = () => {
-  const allowed = [branch.master, branch.beta];
+  if (![branch.isMaster, branch.isBeta].some(Boolean)) {
-
+    console.error(`Must be on an allowed branch to publish! (current: ${branch.current})`);
-  if (!allowed.includes(branch.current)) {
-    console.error(`Must be on ${allowed.join(', ')} to publish! (current: ${branch.current})`);
-
     return false;
   }
 
@@ -195,7 +200,7 @@ gulp.task('demo', (done) => {
   const error = `${paths.demo}error.html`;
   const pages = [index];
 
-  if (branch.current === branch.master) {
+  if (branch.isMaster) {
     pages.push(error);
   }
 
@@ -220,7 +225,7 @@ gulp.task('open', () => {
 
   return gulp.src(__filename).pipe(
     open({
-      uri: `https://${domain}/${branch.current === branch.beta ? 'beta' : ''}`,
+      uri: `https://${domain}/${branch.isBeta ? 'beta' : ''}`,
     }),
   );
 });