v3.7.2

- Fix: Add `@babel/plugin-proposal-optional-chaining` to transform optional chaining in build output

.travis.yml

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

CHANGELOG.md

@@ -1,8 +1,33 @@
+### v3.7.2
+
+- Fix: Add `@babel/plugin-proposal-optional-chaining` to transform optional chaining in build output
+
+### 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: Sass clean up
 - Chore: Improvements to style linting
 
 ### v3.6.10
@@ -12,7 +37,7 @@
 
 ### v3.6.9
 
-- Fix: SASS issue with division (thanks @ROL4ND909 and @le0pard)
+- 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)
@@ -167,7 +192,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
@@ -530,7 +555,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
@@ -763,7 +788,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)
@@ -885,7 +910,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)
 
@@ -922,7 +947,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
 
@@ -944,7 +969,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)
 
@@ -1021,7 +1046,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
 
@@ -1136,7 +1161,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
@@ -1181,7 +1206,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)
 

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
 
@@ -134,13 +137,13 @@ 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 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.11/plyr.js"></script>
+<script src="https://cdn.plyr.io/3.7.2/plyr.js"></script>
 ```
 
 ...or...
 
 ```html
-<script src="https://cdn.plyr.io/3.6.11/plyr.polyfilled.js"></script>
+<script src="https://cdn.plyr.io/3.7.2/plyr.polyfilled.js"></script>
 ```
 
 ## CSS
@@ -154,13 +157,13 @@ Include the `plyr.css` stylesheet 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.11/plyr.css" />
+<link rel="stylesheet" href="https://cdn.plyr.io/3.7.2/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.11/plyr.svg`.
+reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.7.2/plyr.svg`.
 
 # Ads
 
@@ -270,9 +273,9 @@ You can set them in your CSS for all players:
 <video class="player" style="--plyr-color-main: #1ac266;">...</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
@@ -402,7 +405,7 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke
 | `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.                                                                                                                                                                                   |
@@ -410,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:
@@ -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/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,7 +1,9 @@
+@charset "UTF-8";
+
 // ==========================================================================
 // Plyr.io Demo Page
 // ==========================================================================
-@charset 'UTF-8';
+
 @import '../../../../src/sass/lib/css-vars';
 
 $css-vars-use-native: true;

demo/src/sass/bundles/error.scss

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plyr",
-  "version": "3.6.11",
+  "version": "3.7.2",
   "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
   "homepage": "https://plyr.io",
   "author": "Sam Potts <sam@potts.es>",
@@ -36,25 +36,28 @@
     "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.16.5",
+    "@babel/core": "^7.17.9",
-    "@babel/plugin-proposal-class-properties": "^7.16.5",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/preset-env": "^7.16.5",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+    "@babel/preset-env": "^7.16.11",
     "@sampotts/eslint-config": "1.1.7",
-    "autoprefixer": "^10.4.0",
+    "autoprefixer": "^10.4.4",
-    "aws-sdk": "^2.1046.0",
+    "aws-sdk": "^2.1116.0",
     "babel-eslint": "^10.1.0",
-    "browser-sync": "^2.27.7",
+    "browser-sync": "^2.27.9",
     "colorette": "2.0.16",
-    "cssnano": "^5.0.13",
+    "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": "^7.0.0",
     "gulp-header": "^2.0.9",
@@ -66,30 +69,30 @@
     "gulp-postcss": "^9.0.1",
     "gulp-rename": "^2.0.0",
     "gulp-replace": "^1.1.3",
-    "gulp-sass": "^5.0.0",
+    "gulp-sass": "^5.1.0",
     "gulp-size": "^4.0.1",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-svgstore": "^9.0.0",
     "gulp-terser": "^2.1.0",
-    "postcss": "^8.4.5",
+    "postcss": "^8.4.12",
-    "postcss-custom-properties": "^12.0.1",
+    "postcss-custom-properties": "^12.1.7",
-    "postcss-scss": "^4.0.2",
+    "postcss-scss": "^4.0.3",
     "prettier-eslint": "^12.0.0",
     "prettier-stylelint": "^0.4.2",
     "remark-cli": "^10.0.1",
     "remark-validate-links": "^11.0.2",
-    "rollup": "^2.61.1",
+    "rollup": "^2.70.2",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "sass": "^1.45.0",
+    "sass": "^1.50.0",
-    "stylelint": "^14.1.0",
+    "stylelint": "^14.7.1",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-sass-guidelines": "^9.0.1",
     "stylelint-selector-bem-pattern": "^2.1.1"
   },
   "dependencies": {
-    "core-js": "^3.20.0",
+    "core-js": "^3.22.0",
     "custom-event-polyfill": "^1.0.7",
     "loadjs": "^4.2.0",
     "rangetouch": "^2.0.1",

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.11/plyr.svg',
+  iconUrl: 'https://cdn.plyr.io/3.7.2/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',
@@ -441,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

@@ -404,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;
         }
 
@@ -420,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)) {
@@ -450,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);
     });
@@ -484,7 +482,7 @@ const controls = {
 
     menuItem.appendChild(flex);
 
-    // Replicate radio button behaviour
+    // Replicate radio button behavior
     Object.defineProperty(menuItem, 'checked', {
       enumerable: true,
       get() {
@@ -506,7 +504,7 @@ const controls = {
       menuItem,
       'click keyup',
       (event) => {
-        if (is.keyboardEvent(event) && event.which !== 32) {
+        if (is.keyboardEvent(event) && event.key !== 'Space') {
           return;
         }
 
@@ -698,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) {
@@ -713,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;
     }
@@ -726,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
@@ -796,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);
   },
@@ -1124,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
@@ -1512,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();
@@ -1745,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

@@ -207,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/listeners.js

@@ -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;
 
@@ -661,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;
         }
@@ -689,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);
       }
     });
@@ -704,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;
       }
 
@@ -883,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

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

@@ -35,12 +35,12 @@ function parseHash(url) {
    *  - [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 the named group `hash`
+   * If matched, the hash is available in capture group 4
    */
-  const regex = /^.*(?:vimeo.com\/|video\/)(?:\d+)(?:\?.*&*h=|\/)+(?<hash>[\d,a-f]+)/;
+  const regex = /^.*(vimeo.com\/|video\/)(\d+)(\?.*&*h=|\/)+([\d,a-f]+)/;
   const found = url.match(regex);
 
-  return found ? found.groups.hash : null;
+  return found && found.length === 5 ? found[4] : null;
 }
 
 // Set playback state and trigger change (only on actual change)

src/js/plyr.d.ts

@@ -212,7 +212,7 @@ declare class Plyr {
   airplay(): void;
 
   /**
-   * Sets the preview thubmnails for the current source.
+   * Sets the preview thumbnails for the current source.
    */
   setPreviewThumbnails(source: Plyr.PreviewThumbnailsOptions): void;
 
@@ -272,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;
@@ -518,6 +518,16 @@ declare namespace Plyr {
      * Preview Thumbnails Options.
      */
     previewThumbnails?: PreviewThumbnailsOptions;
+
+    /**
+     * Media Metadata Options.
+     */
+    mediaMetadata?: MediaMetadataOptions;
+
+    /**
+     * Markers Options
+     */
+    markers?: MarkersOptions;
   }
 
   interface QualityOptions {
@@ -576,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;

src/js/plyr.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v3.6.11
+// plyr.js v3.7.2
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -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;
@@ -933,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;
   }
 
   /**
@@ -954,11 +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();
+    captions.setup.call(this);
   }
 
   /**
@@ -972,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);

src/js/plyr.polyfilled.js

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

src/js/ui.js

@@ -125,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

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/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/lib/css-vars.scss

@@ -62,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,

src/sass/plugins/ads.scss

@@ -2,8 +2,6 @@
 // Advertisements
 // ==========================================================================
 
-@use 'sass:math';
-
 .plyr__ads {
   border-radius: inherit;
   bottom: 0;
@@ -49,10 +47,10 @@
   display: block;
   height: $plyr-range-track-height;
   left: 0;
-  margin: -calc($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,9 +1,11 @@
+@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;

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

tasks/build.js

@@ -118,7 +118,7 @@ Object.entries(build.js).forEach(([filename, entry]) => {
                       },
                     ],
                   ],
-                  plugins: ['@babel/plugin-proposal-class-properties'],
+                  plugins: ['@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-optional-chaining'],
                   babelrc: false,
                   exclude: [/\/core-js\//],
                 }),