Merge branch 'develop' into css-variables

# Conflicts:
#	demo/dist/demo.css
#	demo/index.html
#	dist/plyr.css
#	gulpfile.js
#	package.json
#	yarn.lock

25 files changed, 1191 insertions, 221 deletions

diff --git a/src/js/config/defaults.js b/src/js/config/defaults.js
index c3f97eee..82809511 100644
--- a/src/js/config/defaults.js
+++ b/src/js/config/defaults.js
@@ -60,7 +60,7 @@ const defaults = {
     // Sprite (for icons)
     loadSprite: true,
     iconPrefix: 'plyr',
-    iconUrl: 'https://cdn.plyr.io/3.4.7/plyr.svg',
+    iconUrl: 'https://cdn.plyr.io/3.5.2/plyr.svg',
 
     // Blank video (used to prevent errors on source change)
     blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@@ -108,7 +108,7 @@ const defaults = {
     // Fullscreen settings
     fullscreen: {
         enabled: true, // Allow fullscreen?
-        fallback: true, // Fallback for vintage browsers
+        fallback: true, // Fallback using full viewport/window
         iosNative: false, // Use the native fullscreen in iOS (disables custom controls)
     },
 
@@ -374,6 +374,16 @@ const defaults = {
             active: 'plyr--airplay-active',
         },
         tabFocus: 'plyr__tab-focus',
+        previewThumbnails: {
+            // Tooltip thumbs
+            thumbContainer: 'plyr__preview-thumb',
+            thumbContainerShown: 'plyr__preview-thumb--is-shown',
+            imageContainer: 'plyr__preview-thumb__image-container',
+            timeContainer: 'plyr__preview-thumb__time-container',
+            // Scrubbing
+            scrubbingContainer: 'plyr__preview-scrubbing',
+            scrubbingContainerShown: 'plyr__preview-scrubbing--is-shown',
+        },
     },
 
     // Embed attributes
@@ -394,6 +404,31 @@ const defaults = {
     ads: {
         enabled: false,
         publisherId: '',
+        tagUrl: '',
+    },
+
+    // Preview Thumbnails plugin
+    previewThumbnails: {
+        enabled: false,
+        src: '',
+    },
+
+    // Vimeo plugin
+    vimeo: {
+        byline: false,
+        portrait: false,
+        title: false,
+        speed: true,
+        transparent: false,
+    },
+
+    // YouTube plugin
+    youtube: {
+        noCookie: false, // Whether to use an alternative version of YouTube without cookies
+        rel: 0, // No related vids
+        showinfo: 0, // Hide info
+        iv_load_policy: 3, // Hide annotations
+        modestbranding: 1, // Hide logos as much as possible (they still show one in the corner when paused)
     },
 };
 
diff --git a/src/js/config/types.js b/src/js/config/types.js
index c9d50937..e0ccdaff 100644
--- a/src/js/config/types.js
+++ b/src/js/config/types.js
@@ -19,7 +19,7 @@ export const types = {
  */
 export function getProviderByUrl(url) {
     // YouTube
-    if (/^(https?:\/\/)?(www\.)?(youtube\.com|youtu\.?be)\/.+$/.test(url)) {
+    if (/^(https?:\/\/)?(www\.)?(youtube\.com|youtube-nocookie\.com|youtu\.?be)\/.+$/.test(url)) {
         return providers.youtube;
     }
 
diff --git a/src/js/controls.js b/src/js/controls.js
index 4f453e6a..73903e16 100644
--- a/src/js/controls.js
+++ b/src/js/controls.js
@@ -3,13 +3,27 @@
 // TODO: This needs to be split into smaller files and cleaned up
 // ==========================================================================
 
+import RangeTouch from 'rangetouch';
 import captions from './captions';
 import html5 from './html5';
 import support from './support';
 import { repaint, transitionEndEvent } from './utils/animation';
 import { dedupe } from './utils/arrays';
 import browser from './utils/browser';
-import { createElement, emptyElement, getAttributesFromSelector, getElement, getElements, hasClass, matches, removeElement, setAttributes, setFocus, toggleClass, toggleHidden } from './utils/elements';
+import {
+    createElement,
+    emptyElement,
+    getAttributesFromSelector,
+    getElement,
+    getElements,
+    hasClass,
+    matches,
+    removeElement,
+    setAttributes,
+    setFocus,
+    toggleClass,
+    toggleHidden,
+} from './utils/elements';
 import { off, on } from './utils/events';
 import i18n from './utils/i18n';
 import is from './utils/is';
@@ -321,6 +335,9 @@ const controls = {
         // Set the fill for webkit now
         controls.updateRangeFill.call(this, input);
 
+        // Improve support on touch devices
+        RangeTouch.setup(input);
+
         return input;
     },
 
@@ -334,7 +351,7 @@ const controls = {
                     min: 0,
                     max: 100,
                     value: 0,
-                    role: 'presentation',
+                    role: 'progressbar',
                     'aria-hidden': true,
                 },
                 attributes,
@@ -667,7 +684,7 @@ const controls = {
         }
 
         // Set CSS custom property
-        range.style.setProperty('--value', `${range.value / range.max * 100}%`);
+        range.style.setProperty('--value', `${(range.value / range.max) * 100}%`);
     },
 
     // Update hover tooltip for seeking
@@ -699,7 +716,7 @@ const controls = {
 
         // Determine percentage, if already visible
         if (is.event(event)) {
-            percent = 100 / clientRect.width * (event.pageX - clientRect.left);
+            percent = (100 / clientRect.width) * (event.pageX - clientRect.left);
         } else if (hasClass(this.elements.display.seekTooltip, visible)) {
             percent = parseFloat(this.elements.display.seekTooltip.style.left, 10);
         } else {
@@ -714,7 +731,7 @@ const controls = {
         }
 
         // Display the time a click would seek to
-        controls.updateTimeDisplay.call(this, this.elements.display.seekTooltip, this.duration / 100 * percent);
+        controls.updateTimeDisplay.call(this, this.elements.display.seekTooltip, (this.duration / 100) * percent);
 
         // Set position
         this.elements.display.seekTooltip.style.left = `${percent}%`;
@@ -1587,7 +1604,7 @@ const controls = {
 
         // If function, run it and use output
         if (is.function(this.config.controls)) {
-            this.config.controls = this.config.controls.call(this.props);
+            this.config.controls = this.config.controls.call(this, props);
         }
 
         // Convert falsy controls to empty array (primarily for empty strings)
@@ -1674,15 +1691,17 @@ const controls = {
                 .filter(Boolean)
                 .forEach(button => {
                     if (is.array(button) || is.nodeList(button)) {
-                        Array.from(button).filter(Boolean).forEach(addProperty);
+                        Array.from(button)
+                            .filter(Boolean)
+                            .forEach(addProperty);
                     } else {
                         addProperty(button);
                     }
                 });
         }
 
-        // Edge sometimes doesn't finish the paint so force a redraw
-        if (window.navigator.userAgent.includes('Edge')) {
+        // Edge sometimes doesn't finish the paint so force a repaint
+        if (browser.isEdge) {
             repaint(target);
         }
 
diff --git a/src/js/fullscreen.js b/src/js/fullscreen.js
index 9c21b82a..c86bf877 100644
--- a/src/js/fullscreen.js
+++ b/src/js/fullscreen.js
@@ -94,6 +94,9 @@ class Fullscreen {
         // Scroll position
         this.scrollPosition = { x: 0, y: 0 };
 
+        // Force the use of 'full window/browser' rather than fullscreen
+        this.forceFallback = player.config.fullscreen.fallback === 'force';
+
         // Register event listeners
         // Handle event (incase user presses escape etc)
         on.call(
@@ -130,6 +133,11 @@ class Fullscreen {
         );
     }
 
+    // If we're actually using native
+    get usingNative() {
+        return Fullscreen.native && !this.forceFallback;
+    }
+
     // Get the prefix for handlers
     static get prefix() {
         // No prefix
@@ -174,7 +182,7 @@ class Fullscreen {
         }
 
         // Fallback using classname
-        if (!Fullscreen.native) {
+        if (!Fullscreen.native || this.forceFallback) {
             return hasClass(this.target, this.player.config.classNames.fullscreen.fallback);
         }
 
@@ -193,7 +201,17 @@ class Fullscreen {
     // Update UI
     update() {
         if (this.enabled) {
-            this.player.debug.log(`${Fullscreen.native ? 'Native' : 'Fallback'} fullscreen enabled`);
+            let mode;
+
+            if (this.forceFallback) {
+                mode = 'Fallback (forced)';
+            } else if (Fullscreen.native) {
+                mode = 'Native';
+            } else {
+                mode = 'Fallback';
+            }
+
+            this.player.debug.log(`${mode} fullscreen enabled`);
         } else {
             this.player.debug.log('Fullscreen not supported and fallback disabled');
         }
@@ -211,7 +229,7 @@ class Fullscreen {
         // iOS native fullscreen doesn't need the request step
         if (browser.isIos && this.player.config.fullscreen.iosNative) {
             this.target.webkitEnterFullscreen();
-        } else if (!Fullscreen.native) {
+        } else if (!Fullscreen.native || this.forceFallback) {
             toggleFallback.call(this, true);
         } else if (!this.prefix) {
             this.target.requestFullscreen();
@@ -230,7 +248,7 @@ class Fullscreen {
         if (browser.isIos && this.player.config.fullscreen.iosNative) {
             this.target.webkitExitFullscreen();
             this.player.play();
-        } else if (!Fullscreen.native) {
+        } else if (!Fullscreen.native || this.forceFallback) {
             toggleFallback.call(this, false);
         } else if (!this.prefix) {
             (document.cancelFullScreen || document.exitFullscreen).call(document);
diff --git a/src/js/html5.js b/src/js/html5.js
index 0876211a..3266a58e 100644
--- a/src/js/html5.js
+++ b/src/js/html5.js
@@ -5,6 +5,7 @@
 import support from './support';
 import { removeElement } from './utils/elements';
 import { triggerEvent } from './utils/events';
+import is from './utils/is';
 
 const html5 = {
     getSources() {
@@ -14,8 +15,16 @@ const html5 = {
 
         const sources = Array.from(this.media.querySelectorAll('source'));
 
-        // Filter out unsupported sources
-        return sources.filter(source => support.mime.call(this, source.getAttribute('type')));
+        // Filter out unsupported sources (if type is specified)
+        return sources.filter(source => {
+            const type = source.getAttribute('type');
+
+            if (is.empty(type)) {
+                return true;
+            }
+
+            return support.mime.call(this, type);
+        });
     },
 
     // Get quality levels
diff --git a/src/js/listeners.js b/src/js/listeners.js
index dd6e2adb..3c65b824 100644
--- a/src/js/listeners.js
+++ b/src/js/listeners.js
@@ -7,8 +7,9 @@ import ui from './ui';
 import { repaint } from './utils/animation';
 import browser from './utils/browser';
 import { getElement, getElements, matches, toggleClass, toggleHidden } from './utils/elements';
-import { on, once, toggleListener, triggerEvent } from './utils/events';
+import { off, on, once, toggleListener, triggerEvent } from './utils/events';
 import is from './utils/is';
+import { setAspectRatio } from './utils/style';
 
 class Listeners {
     constructor(player) {
@@ -164,7 +165,7 @@ class Listeners {
 
             // Escape is handle natively when in full screen
             // So we only need to worry about non native
-            if (!player.fullscreen.enabled && player.fullscreen.active && code === 27) {
+            if (code === 27 && !player.fullscreen.usingNative && player.fullscreen.active) {
                 player.fullscreen.toggle();
             }
 
@@ -261,10 +262,10 @@ class Listeners {
     // Container listeners
     container() {
         const { player } = this;
-        const { elements } = player;
+        const { config, elements, timers } = player;
 
         // Keyboard shortcuts
-        if (!player.config.keyboard.global && player.config.keyboard.focused) {
+        if (!config.keyboard.global && config.keyboard.focused) {
             on.call(player, elements.container, 'keydown keyup', this.handleKey, false);
         }
 
@@ -294,12 +295,78 @@ class Listeners {
                 }
 
                 // Clear timer
-                clearTimeout(player.timers.controls);
+                clearTimeout(timers.controls);
 
                 // Set new timer to prevent flicker when seeking
-                player.timers.controls = setTimeout(() => ui.toggleControls.call(player, false), delay);
+                timers.controls = setTimeout(() => ui.toggleControls.call(player, false), delay);
             },
         );
+
+        // Force edge to repaint on exit fullscreen
+        // TODO: Fix weird bug where Edge doesn't re-draw when exiting fullscreen
+        /* if (browser.isEdge) {
+            on.call(player, elements.container, 'exitfullscreen', () => {
+                setTimeout(() => repaint(elements.container), 100);
+            });
+        } */
+
+        // Set a gutter for Vimeo
+        const setGutter = (ratio, padding, toggle) => {
+            if (!player.isVimeo) {
+                return;
+            }
+
+            const target = player.elements.wrapper.firstChild;
+            const [, height] = ratio.split(':').map(Number);
+            const [videoWidth, videoHeight] = player.embed.ratio.split(':').map(Number);
+
+            target.style.maxWidth = toggle ? `${(height / videoHeight) * videoWidth}px` : null;
+            target.style.margin = toggle ? '0 auto' : null;
+        };
+
+        // Resize on fullscreen change
+        const setPlayerSize = measure => {
+            // If we don't need to measure the viewport
+            if (!measure) {
+                return setAspectRatio.call(player);
+            }
+
+            const rect = elements.container.getBoundingClientRect();
+            const { width, height } = rect;
+
+            return setAspectRatio.call(player, `${width}:${height}`);
+        };
+
+        const resized = () => {
+            window.clearTimeout(timers.resized);
+            timers.resized = window.setTimeout(setPlayerSize, 50);
+        };
+
+        on.call(player, elements.container, 'enterfullscreen exitfullscreen', event => {
+            const { target, usingNative } = player.fullscreen;
+
+            // Ignore for iOS native
+            if (!player.isEmbed || target !== elements.container) {
+                return;
+            }
+
+            const isEnter = event.type === 'enterfullscreen';
+
+            // Set the player size when entering fullscreen to viewport size
+            const { padding, ratio } = setPlayerSize(isEnter);
+
+            // Set Vimeo gutter
+            setGutter(ratio, padding, isEnter);
+
+            // If not using native fullscreen, we need to check for resizes of viewport
+            if (!usingNative) {
+                if (isEnter) {
+                    on.call(player, window, 'resize', resized);
+                } else {
+                    off.call(player, window, 'resize', resized);
+                }
+            }
+        });
     }
 
     // Listen for media events
@@ -347,20 +414,6 @@ class Listeners {
         // Loading state
         on.call(player, player.media, 'waiting canplay seeked playing', event => ui.checkLoading.call(player, event));
 
-        // If autoplay, then load advertisement if required
-        // TODO: Show some sort of loading state while the ad manager loads else there's a delay before ad shows
-        on.call(player, player.media, 'playing', () => {
-            if (!player.ads) {
-                return;
-            }
-
-            // If ads are enabled, wait for them first
-            if (player.ads.enabled && !player.ads.initialized) {
-                // Wait for manager response
-                player.ads.managerPromise.then(() => player.ads.play()).catch(() => player.play());
-            }
-        });
-
         // Click video
         if (player.supported.ui && player.config.clickToPlay && !player.isAudio) {
             // Re-fetch the wrapper
@@ -386,10 +439,10 @@ class Listeners {
                 }
 
                 if (player.ended) {
-                    player.restart();
-                    player.play();
+                    this.proxy(event, player.restart, 'restart');
+                    this.proxy(event, player.play, 'play');
                 } else {
-                    player.togglePlay();
+                    this.proxy(event, player.togglePlay, 'play');
                 }
             });
         }
@@ -673,6 +726,42 @@ class Listeners {
             controls.updateSeekTooltip.call(player, event),
         );
 
+        // Preview thumbnails plugin
+        // TODO: Really need to work on some sort of plug-in wide event bus or pub-sub for this
+        this.bind(elements.progress, 'mousemove touchmove', event => {
+            const { previewThumbnails } = player;
+
+            if (previewThumbnails && previewThumbnails.loaded) {
+                previewThumbnails.startMove(event);
+            }
+        });
+
+        // Hide thumbnail preview - on mouse click, mouse leave, and video play/seek. All four are required, e.g., for buffering
+        this.bind(elements.progress, 'mouseleave click', () => {
+            const { previewThumbnails } = player;
+
+            if (previewThumbnails && previewThumbnails.loaded) {
+                previewThumbnails.endMove(false, true);
+            }
+        });
+
+        // Show scrubbing preview
+        this.bind(elements.progress, 'mousedown touchstart', event => {
+            const { previewThumbnails } = player;
+
+            if (previewThumbnails && previewThumbnails.loaded) {
+                previewThumbnails.startScrubbing(event);
+            }
+        });
+
+        this.bind(elements.progress, 'mouseup touchend', event => {
+            const { previewThumbnails } = player;
+
+            if (previewThumbnails && previewThumbnails.loaded) {
+                previewThumbnails.endScrubbing(event);
+            }
+        });
+
         // Polyfill for lower fill in <input type="range"> for webkit
         if (browser.isWebkit) {
             Array.from(getElements.call(player, 'input[type="range"]')).forEach(element => {
diff --git a/src/js/plugins/ads.js b/src/js/plugins/ads.js
index 375fdc13..c9256b0e 100644
--- a/src/js/plugins/ads.js
+++ b/src/js/plugins/ads.js
@@ -17,12 +17,12 @@ import { buildUrlParams } from '../utils/urls';
 class Ads {
     /**
      * Ads constructor.
-     * @param {object} player
+     * @param {Object} player
      * @return {Ads}
      */
     constructor(player) {
         this.player = player;
-        this.publisherId = player.config.ads.publisherId;
+        this.config = player.config.ads;
         this.playing = false;
         this.initialized = false;
         this.elements = {
@@ -49,8 +49,13 @@ class Ads {
     }
 
     get enabled() {
+        const { config } = this;
+
         return (
-            this.player.isHTML5 && this.player.isVideo && this.player.config.ads.enabled && !is.empty(this.publisherId)
+            this.player.isHTML5 &&
+            this.player.isVideo &&
+            config.enabled &&
+            (!is.empty(config.publisherId) || is.url(config.tagUrl))
         );
     }
 
@@ -95,8 +100,14 @@ class Ads {
         this.setupIMA();
     }
 
-    // Build the default tag URL
+    // Build the tag URL
     get tagUrl() {
+        const { config } = this;
+
+        if (is.url(config.tagUrl)) {
+            return config.tagUrl;
+        }
+
         const params = {
             AV_PUBLISHERID: '58c25bb0073ef448b1087ad6',
             AV_CHANNELID: '5a0458dc28a06145e4519d21',
@@ -125,6 +136,7 @@ class Ads {
         this.elements.container = createElement('div', {
             class: this.player.config.classNames.ads,
         });
+
         this.player.elements.container.appendChild(this.elements.container);
 
         // So we can run VPAID2
@@ -133,9 +145,11 @@ class Ads {
         // Set language
         google.ima.settings.setLocale(this.player.config.ads.language);
 
-        // We assume the adContainer is the video container of the plyr element
-        // that will house the ads
-        this.elements.displayContainer = new google.ima.AdDisplayContainer(this.elements.container);
+        // Set playback for iOS10+
+        google.ima.settings.setDisableCustomPlaybackForIOS10Plus(this.player.config.playsinline);
+
+        // We assume the adContainer is the video container of the plyr element that will house the ads
+        this.elements.displayContainer = new google.ima.AdDisplayContainer(this.elements.container, this.player.media);
 
         // Request video ads to be pre-loaded
         this.requestAds();
@@ -184,7 +198,7 @@ class Ads {
 
     /**
      * Update the ad countdown
-     * @param {boolean} start
+     * @param {Boolean} start
      */
     pollCountdown(start = false) {
         if (!start) {
@@ -226,6 +240,23 @@ class Ads {
         // Get the cue points for any mid-rolls by filtering out the pre- and post-roll
         this.cuePoints = this.manager.getCuePoints();
 
+        // Set volume to match player
+        this.manager.setVolume(this.player.volume);
+
+        // Add listeners to the required events
+        // Advertisement error events
+        this.manager.addEventListener(google.ima.AdErrorEvent.Type.AD_ERROR, error => this.onAdError(error));
+
+        // Advertisement regular events
+        Object.keys(google.ima.AdEvent.Type).forEach(type => {
+            this.manager.addEventListener(google.ima.AdEvent.Type[type], event => this.onAdEvent(event));
+        });
+
+        // Resolve our adsManager
+        this.trigger('loaded');
+    }
+
+    addCuePoints() {
         // Add advertisement cue's within the time line if available
         if (!is.empty(this.cuePoints)) {
             this.cuePoints.forEach(cuePoint => {
@@ -233,7 +264,7 @@ class Ads {
                     const seekElement = this.player.elements.progress;
 
                     if (is.element(seekElement)) {
-                        const cuePercentage = 100 / this.player.duration * cuePoint;
+                        const cuePercentage = (100 / this.player.duration) * cuePoint;
                         const cue = createElement('span', {
                             class: this.player.config.classNames.cues,
                         });
@@ -244,21 +275,6 @@ class Ads {
                 }
             });
         }
-
-        // Set volume to match player
-        this.manager.setVolume(this.player.volume);
-
-        // Add listeners to the required events
-        // Advertisement error events
-        this.manager.addEventListener(google.ima.AdErrorEvent.Type.AD_ERROR, error => this.onAdError(error));
-
-        // Advertisement regular events
-        Object.keys(google.ima.AdEvent.Type).forEach(type => {
-            this.manager.addEventListener(google.ima.AdEvent.Type[type], event => this.onAdEvent(event));
-        });
-
-        // Resolve our adsManager
-        this.trigger('loaded');
     }
 
     /**
@@ -273,6 +289,7 @@ class Ads {
         // Retrieve the ad from the event. Some events (e.g. ALL_ADS_COMPLETED)
         // don't have ad object associated
         const ad = event.getAd();
+        const adData = event.getAdData();
 
         // Proxy event
         const dispatchEvent = type => {
@@ -368,6 +385,12 @@ class Ads {
                 dispatchEvent(event.type);
                 break;
 
+            case google.ima.AdEvent.Type.LOG:
+                if (adData.adError) {
+                    this.player.debug.warn(`Non-fatal ad error: ${adData.adError.getMessage()}`);
+                }
+                break;
+
             default:
                 break;
         }
@@ -391,14 +414,16 @@ class Ads {
         const { container } = this.player.elements;
         let time;
 
-        // Add listeners to the required events
+        this.player.on('canplay', () => {
+            this.addCuePoints();
+        });
+
         this.player.on('ended', () => {
             this.loader.contentComplete();
         });
 
-        this.player.on('seeking', () => {
+        this.player.on('timeupdate', () => {
             time = this.player.currentTime;
-            return time;
         });
 
         this.player.on('seeked', () => {
@@ -471,10 +496,8 @@ class Ads {
         // Ad is stopped
         this.playing = false;
 
-        // Play our video
-        if (this.player.currentTime < this.player.duration) {
-            this.player.play();
-        }
+        // Play video
+        this.player.media.play();
     }
 
     /**
@@ -484,11 +507,11 @@ class Ads {
         // Show the advertisement container
         this.elements.container.style.zIndex = 3;
 
-        // Ad is playing.
+        // Ad is playing
         this.playing = true;
 
         // Pause our video.
-        this.player.pause();
+        this.player.media.pause();
     }
 
     /**
@@ -536,7 +559,7 @@ class Ads {
 
     /**
      * Handles callbacks after an ad event was invoked
-     * @param {string} event - Event type
+     * @param {String} event - Event type
      */
     trigger(event, ...args) {
         const handlers = this.events[event];
@@ -552,8 +575,8 @@ class Ads {
 
     /**
      * Add event listeners
-     * @param {string} event - Event type
-     * @param {function} callback - Callback for when event occurs
+     * @param {String} event - Event type
+     * @param {Function} callback - Callback for when event occurs
      * @return {Ads}
      */
     on(event, callback) {
@@ -571,8 +594,8 @@ class Ads {
      * The advertisement has 12 seconds to get its things together. We stop this timer when the
      * advertisement is playing, or when a user action is required to start, then we clear the
      * timer on ad ready
-     * @param {number} time
-     * @param {string} from
+     * @param {Number} time
+     * @param {String} from
      */
     startSafetyTimer(time, from) {
         this.player.debug.log(`Safety timer invoked from: ${from}`);
@@ -585,7 +608,7 @@ class Ads {
 
     /**
      * Clear our safety timer(s)
-     * @param {string} from
+     * @param {String} from
      */
     clearSafetyTimer(from) {
         if (!is.nullOrUndefined(this.safetyTimer)) {
diff --git a/src/js/plugins/previewThumbnails.js b/src/js/plugins/previewThumbnails.js
new file mode 100644
index 00000000..bd7a6bbd
--- /dev/null
+++ b/src/js/plugins/previewThumbnails.js
@@ -0,0 +1,639 @@
+import { createElement } from '../utils/elements';
+import { once } from '../utils/events';
+import fetch from '../utils/fetch';
+import is from '../utils/is';
+import { formatTime } from '../utils/time';
+
+// Arg: vttDataString example: "WEBVTT\n\n1\n00:00:05.000 --> 00:00:10.000\n1080p-00001.jpg"
+const parseVtt = vttDataString => {
+    const processedList = [];
+    const frames = vttDataString.split(/\r\n\r\n|\n\n|\r\r/);
+
+    frames.forEach(frame => {
+        const result = {};
+        const lines = frame.split(/\r\n|\n|\r/);
+
+        lines.forEach(line => {
+            if (!is.number(result.startTime)) {
+                // The line with start and end times on it is the first line of interest
+                const matchTimes = line.match(
+                    /([0-9]{2}):([0-9]{2}):([0-9]{2}).([0-9]{2,3})( ?--> ?)([0-9]{2}):([0-9]{2}):([0-9]{2}).([0-9]{2,3})/,
+                ); // Note that this currently ignores caption formatting directives that are optionally on the end of this line - fine for non-captions VTT
+
+                if (matchTimes) {
+                    result.startTime =
+                        Number(matchTimes[1]) * 60 * 60 +
+                        Number(matchTimes[2]) * 60 +
+                        Number(matchTimes[3]) +
+                        Number(`0.${matchTimes[4]}`);
+                    result.endTime =
+                        Number(matchTimes[6]) * 60 * 60 +
+                        Number(matchTimes[7]) * 60 +
+                        Number(matchTimes[8]) +
+                        Number(`0.${matchTimes[9]}`);
+                }
+            } else if (!is.empty(line.trim()) && is.empty(result.text)) {
+                // If we already have the startTime, then we're definitely up to the text line(s)
+                const lineSplit = line.trim().split('#xywh=');
+                [result.text] = lineSplit;
+
+                // If there's content in lineSplit[1], then we have sprites. If not, then it's just one frame per image
+                if (lineSplit[1]) {
+                    [result.x, result.y, result.w, result.h] = lineSplit[1].split(',');
+                }
+            }
+        });
+
+        if (result.text) {
+            processedList.push(result);
+        }
+    });
+
+    return processedList;
+};
+
+/**
+ * Preview thumbnails for seek hover and scrubbing
+ * Seeking: Hover over the seek bar (desktop only): shows a small preview container above the seek bar
+ * Scrubbing: Click and drag the seek bar (desktop and mobile): shows the preview image over the entire video, as if the video is scrubbing at very high speed
+ *
+ * Notes:
+ * - Thumbs are set via JS settings on Plyr init, not HTML5 'track' property. Using the track property would be a bit gross, because it doesn't support custom 'kinds'. kind=metadata might be used for something else, and we want to allow multiple thumbnails tracks. Tracks must have a unique combination of 'kind' and 'label'. We would have to do something like kind=metadata,label=thumbnails1 / kind=metadata,label=thumbnails2. Square peg, round hole
+ * - VTT info: the image URL is relative to the VTT, not the current document. But if the url starts with a slash, it will naturally be relative to the current domain. https://support.jwplayer.com/articles/how-to-add-preview-thumbnails
+ * - This implementation uses multiple separate img elements. Other implementations use background-image on one element. This would be nice and simple, but Firefox and Safari have flickering issues with replacing backgrounds of larger images. It seems that YouTube perhaps only avoids this because they don't have the option for high-res previews (even the fullscreen ones, when mousedown/seeking). Images appear over the top of each other, and previous ones are discarded once the new ones have been rendered
+ */
+
+class PreviewThumbnails {
+    /**
+     * PreviewThumbnails constructor.
+     * @param {Plyr} player
+     * @return {PreviewThumbnails}
+     */
+    constructor(player) {
+        this.player = player;
+        this.thumbnails = [];
+        this.loaded = false;
+        this.lastMouseMoveTime = Date.now();
+        this.mouseDown = false;
+        this.loadedImages = [];
+
+        this.elements = {
+            thumb: {},
+            scrubbing: {},
+        };
+
+        this.load();
+    }
+
+    get enabled() {
+        return this.player.isHTML5 && this.player.isVideo && this.player.config.previewThumbnails.enabled;
+    }
+
+    load() {
+        // Togglethe regular seek tooltip
+        if (this.player.elements.display.seekTooltip) {
+            this.player.elements.display.seekTooltip.hidden = this.enabled;
+        }
+
+        if (!this.enabled) {
+            return;
+        }
+
+        this.getThumbnails().then(() => {
+            // Render DOM elements
+            this.render();
+
+            // Check to see if thumb container size was specified manually in CSS
+            this.determineContainerAutoSizing();
+
+            this.loaded = true;
+        });
+    }
+
+    // Download VTT files and parse them
+    getThumbnails() {
+        return new Promise(resolve => {
+            const { src } = this.player.config.previewThumbnails;
+
+            if (is.empty(src)) {
+                throw new Error('Missing previewThumbnails.src config attribute');
+            }
+
+            // If string, convert into single-element list
+            const urls = is.string(src) ? [src] : src;
+
+            // Loop through each src URL. Download and process the VTT file, storing the resulting data in this.thumbnails
+            const promises = urls.map(u => this.getThumbnail(u));
+
+            Promise.all(promises).then(() => {
+                // Sort smallest to biggest (e.g., [120p, 480p, 1080p])
+                this.thumbnails.sort((x, y) => x.height - y.height);
+
+                this.player.debug.log('Preview thumbnails', this.thumbnails);
+
+                resolve();
+            });
+        });
+    }
+
+    // Process individual VTT file
+    getThumbnail(url) {
+        return new Promise(resolve => {
+            fetch(url).then(response => {
+                const thumbnail = {
+                    frames: parseVtt(response),
+                    height: null,
+                    urlPrefix: '',
+                };
+
+                // If the URLs don't start with '/', then we need to set their relative path to be the location of the VTT file
+                // If the URLs do start with '/', then they obviously don't need a prefix, so it will remain blank
+                if (!thumbnail.frames[0].text.startsWith('/')) {
+                    thumbnail.urlPrefix = url.substring(0, url.lastIndexOf('/') + 1);
+                }
+
+                // Download the first frame, so that we can determine/set the height of this thumbnailsDef
+                const tempImage = new Image();
+
+                tempImage.onload = () => {
+                    thumbnail.height = tempImage.naturalHeight;
+                    thumbnail.width = tempImage.naturalWidth;
+
+                    this.thumbnails.push(thumbnail);
+
+                    resolve();
+                };
+
+                tempImage.src = thumbnail.urlPrefix + thumbnail.frames[0].text;
+            });
+        });
+    }
+
+    startMove(event) {
+        if (!this.loaded) {
+            return;
+        }
+
+        if (!is.event(event) || !['touchmove', 'mousemove'].includes(event.type)) {
+            return;
+        }
+
+        // Wait until media has a duration
+        if (!this.player.media.duration) {
+            return;
+        }
+
+        if (event.type === 'touchmove') {
+            // Calculate seek hover position as approx video seconds
+            this.seekTime = this.player.media.duration * (this.player.elements.inputs.seek.value / 100);
+        } else {
+            // Calculate seek hover position as approx video seconds
+            const clientRect = this.player.elements.progress.getBoundingClientRect();
+            const percentage = (100 / clientRect.width) * (event.pageX - clientRect.left);
+            this.seekTime = this.player.media.duration * (percentage / 100);
+
+            if (this.seekTime < 0) {
+                // The mousemove fires for 10+px out to the left
+                this.seekTime = 0;
+            }
+
+            if (this.seekTime > this.player.media.duration - 1) {
+                // Took 1 second off the duration for safety, because different players can disagree on the real duration of a video
+                this.seekTime = this.player.media.duration - 1;
+            }
+
+            this.mousePosX = event.pageX;
+
+            // Set time text inside image container
+            this.elements.thumb.time.innerText = formatTime(this.seekTime);
+        }
+
+        // Download and show image
+        this.showImageAtCurrentTime();
+    }
+
+    endMove() {
+        this.toggleThumbContainer(false, true);
+    }
+
+    startScrubbing(event) {
+        // Only act on left mouse button (0), or touch device (event.button is false)
+        if (event.button === false || event.button === 0) {
+            this.mouseDown = true;
+
+            // Wait until media has a duration
+            if (this.player.media.duration) {
+                this.toggleScrubbingContainer(true);
+                this.toggleThumbContainer(false, true);
+
+                // Download and show image
+                this.showImageAtCurrentTime();
+            }
+        }
+    }
+
+    endScrubbing() {
+        this.mouseDown = false;
+
+        // Hide scrubbing preview. But wait until the video has successfully seeked before hiding the scrubbing preview
+        if (Math.ceil(this.lastTime) === Math.ceil(this.player.media.currentTime)) {
+            // The video was already seeked/loaded at the chosen time - hide immediately
+            this.toggleScrubbingContainer(false);
+        } else {
+            // The video hasn't seeked yet. Wait for that
+            once.call(this.player, this.player.media, 'timeupdate', () => {
+                // Re-check mousedown - we might have already started scrubbing again
+                if (!this.mouseDown) {
+                    this.toggleScrubbingContainer(false);
+                }
+            });
+        }
+    }
+
+    /**
+     * Setup hooks for Plyr and window events
+     */
+    listeners() {
+        // Hide thumbnail preview - on mouse click, mouse leave (in listeners.js for now), and video play/seek. All four are required, e.g., for buffering
+        this.player.on('play', () => {
+            this.toggleThumbContainer(false, true);
+        });
+
+        this.player.on('seeked', () => {
+            this.toggleThumbContainer(false);
+        });
+
+        this.player.on('timeupdate', () => {
+            this.lastTime = this.player.media.currentTime;
+        });
+    }
+
+    /**
+     * Create HTML elements for image containers
+     */
+    render() {
+        // Create HTML element: plyr__preview-thumbnail-container
+        this.elements.thumb.container = createElement('div', {
+            class: this.player.config.classNames.previewThumbnails.thumbContainer,
+        });
+
+        // Wrapper for the image for styling
+        this.elements.thumb.imageContainer = createElement('div', {
+            class: this.player.config.classNames.previewThumbnails.imageContainer,
+        });
+        this.elements.thumb.container.appendChild(this.elements.thumb.imageContainer);
+
+        // Create HTML element, parent+span: time text (e.g., 01:32:00)
+        const timeContainer = createElement('div', {
+            class: this.player.config.classNames.previewThumbnails.timeContainer,
+        });
+
+        this.elements.thumb.time = createElement('span', {}, '00:00');
+        timeContainer.appendChild(this.elements.thumb.time);
+
+        this.elements.thumb.container.appendChild(timeContainer);
+
+        // Inject the whole thumb
+        this.player.elements.progress.appendChild(this.elements.thumb.container);
+
+        // Create HTML element: plyr__preview-scrubbing-container
+        this.elements.scrubbing.container = createElement('div', {
+            class: this.player.config.classNames.previewThumbnails.scrubbingContainer,
+        });
+
+        this.player.elements.wrapper.appendChild(this.elements.scrubbing.container);
+    }
+
+    showImageAtCurrentTime() {
+        if (this.mouseDown) {
+            this.setScrubbingContainerSize();
+        } else {
+            this.setThumbContainerSizeAndPos();
+        }
+
+        // Find the desired thumbnail index
+        // TODO: Handle a video longer than the thumbs where thumbNum is null
+        const thumbNum = this.thumbnails[0].frames.findIndex(
+            frame => this.seekTime >= frame.startTime && this.seekTime <= frame.endTime,
+        );
+        const hasThumb = thumbNum >= 0;
+        let qualityIndex = 0;
+
+        // Show the thumb container if we're not scrubbing
+        if (!this.mouseDown) {
+            this.toggleThumbContainer(hasThumb);
+        }
+
+        // No matching thumb found
+        if (!hasThumb) {
+            return;
+        }
+
+        // Check to see if we've already downloaded higher quality versions of this image
+        this.thumbnails.forEach((thumbnail, index) => {
+            if (this.loadedImages.includes(thumbnail.frames[thumbNum].text)) {
+                qualityIndex = index;
+            }
+        });
+
+        // Only proceed if either thumbnum or thumbfilename has changed
+        if (thumbNum !== this.showingThumb) {
+            this.showingThumb = thumbNum;
+            this.loadImage(qualityIndex);
+        }
+    }
+
+    // Show the image that's currently specified in this.showingThumb
+    loadImage(qualityIndex = 0) {
+        const thumbNum = this.showingThumb;
+        const thumbnail = this.thumbnails[qualityIndex];
+        const { urlPrefix } = thumbnail;
+        const frame = thumbnail.frames[thumbNum];
+        const thumbFilename = thumbnail.frames[thumbNum].text;
+        const thumbUrl = urlPrefix + thumbFilename;
+
+        if (!this.currentImageElement || this.currentImageElement.dataset.filename !== thumbFilename) {
+            // If we're already loading a previous image, remove its onload handler - we don't want it to load after this one
+            // Only do this if not using sprites. Without sprites we really want to show as many images as possible, as a best-effort
+            if (this.loadingImage && this.usingSprites) {
+                this.loadingImage.onload = null;
+            }
+
+            // We're building and adding a new image. In other implementations of similar functionality (YouTube), background image
+            // is instead used. But this causes issues with larger images in Firefox and Safari - switching between background
+            // images causes a flicker. Putting a new image over the top does not
+            const previewImage = new Image();
+            previewImage.src = thumbUrl;
+            previewImage.dataset.index = thumbNum;
+            previewImage.dataset.filename = thumbFilename;
+            this.showingThumbFilename = thumbFilename;
+
+            this.player.debug.log(`Loading image: ${thumbUrl}`);
+
+            // For some reason, passing the named function directly causes it to execute immediately. So I've wrapped it in an anonymous function...
+            previewImage.onload = () =>
+                this.showImage(previewImage, frame, qualityIndex, thumbNum, thumbFilename, true);
+            this.loadingImage = previewImage;
+            this.removeOldImages(previewImage);
+        } else {
+            // Update the existing image
+            this.showImage(this.currentImageElement, frame, qualityIndex, thumbNum, thumbFilename, false);
+            this.currentImageElement.dataset.index = thumbNum;
+            this.removeOldImages(this.currentImageElement);
+        }
+    }
+
+    showImage(previewImage, frame, qualityIndex, thumbNum, thumbFilename, newImage = true) {
+        this.player.debug.log(
+            `Showing thumb: ${thumbFilename}. num: ${thumbNum}. qual: ${qualityIndex}. newimg: ${newImage}`,
+        );
+        this.setImageSizeAndOffset(previewImage, frame);
+
+        if (newImage) {
+            this.currentImageContainer.appendChild(previewImage);
+            this.currentImageElement = previewImage;
+
+            if (!this.loadedImages.includes(thumbFilename)) {
+                this.loadedImages.push(thumbFilename);
+            }
+        }
+
+        // Preload images before and after the current one
+        // Show higher quality of the same frame
+        // Each step here has a short time delay, and only continues if still hovering/seeking the same spot. This is to protect slow connections from overloading
+        this.preloadNearby(thumbNum, true)
+            .then(this.preloadNearby(thumbNum, false))
+            .then(this.getHigherQuality(qualityIndex, previewImage, frame, thumbFilename));
+    }
+
+    // Remove all preview images that aren't the designated current image
+    removeOldImages(currentImage) {
+        // Get a list of all images, convert it from a DOM list to an array
+        Array.from(this.currentImageContainer.children).forEach(image => {
+            if (image.tagName.toLowerCase() !== 'img') {
+                return;
+            }
+
+            const removeDelay = this.usingSprites ? 500 : 1000;
+
+            if (image.dataset.index !== currentImage.dataset.index && !image.dataset.deleting) {
+                // Wait 200ms, as the new image can take some time to show on certain browsers (even though it was downloaded before showing). This will prevent flicker, and show some generosity towards slower clients
+                // First set attribute 'deleting' to prevent multi-handling of this on repeat firing of this function
+                image.dataset.deleting = true;
+                // This has to be set before the timeout - to prevent issues switching between hover and scrub
+                const { currentImageContainer } = this;
+
+                setTimeout(() => {
+                    currentImageContainer.removeChild(image);
+                    this.player.debug.log(`Removing thumb: ${image.dataset.filename}`);
+                }, removeDelay);
+            }
+        });
+    }
+
+    // Preload images before and after the current one. Only if the user is still hovering/seeking the same frame
+    // This will only preload the lowest quality
+    preloadNearby(thumbNum, forward = true) {
+        return new Promise(resolve => {
+            setTimeout(() => {
+                const oldThumbFilename = this.thumbnails[0].frames[thumbNum].text;
+
+                if (this.showingThumbFilename === oldThumbFilename) {
+                    // Find the nearest thumbs with different filenames. Sometimes it'll be the next index, but in the case of sprites, it might be 100+ away
+                    let thumbnailsClone;
+                    if (forward) {
+                        thumbnailsClone = this.thumbnails[0].frames.slice(thumbNum);
+                    } else {
+                        thumbnailsClone = this.thumbnails[0].frames.slice(0, thumbNum).reverse();
+                    }
+
+                    let foundOne = false;
+
+                    thumbnailsClone.forEach(frame => {
+                        const newThumbFilename = frame.text;
+
+                        if (newThumbFilename !== oldThumbFilename) {
+                            // Found one with a different filename. Make sure it hasn't already been loaded on this page visit
+                            if (!this.loadedImages.includes(newThumbFilename)) {
+                                foundOne = true;
+                                this.player.debug.log(`Preloading thumb filename: ${newThumbFilename}`);
+
+                                const { urlPrefix } = this.thumbnails[0];
+                                const thumbURL = urlPrefix + newThumbFilename;
+
+                                const previewImage = new Image();
+                                previewImage.src = thumbURL;
+                                previewImage.onload = () => {
+                                    this.player.debug.log(`Preloaded thumb filename: ${newThumbFilename}`);
+                                    if (!this.loadedImages.includes(newThumbFilename))
+                                        this.loadedImages.push(newThumbFilename);
+
+                                    // We don't resolve until the thumb is loaded
+                                    resolve();
+                                };
+                            }
+                        }
+                    });
+
+                    // If there are none to preload then we want to resolve immediately
+                    if (!foundOne) {
+                        resolve();
+                    }
+                }
+            }, 300);
+        });
+    }
+
+    // If user has been hovering current image for half a second, look for a higher quality one
+    getHigherQuality(currentQualityIndex, previewImage, frame, thumbFilename) {
+        if (currentQualityIndex < this.thumbnails.length - 1) {
+            // Only use the higher quality version if it's going to look any better - if the current thumb is of a lower pixel density than the thumbnail container
+            let previewImageHeight = previewImage.naturalHeight;
+
+            if (this.usingSprites) {
+                previewImageHeight = frame.h;
+            }
+
+            if (previewImageHeight < this.thumbContainerHeight) {
+                // Recurse back to the loadImage function - show a higher quality one, but only if the viewer is on this frame for a while
+                setTimeout(() => {
+                    // Make sure the mouse hasn't already moved on and started hovering at another image
+                    if (this.showingThumbFilename === thumbFilename) {
+                        this.player.debug.log(`Showing higher quality thumb for: ${thumbFilename}`);
+                        this.loadImage(currentQualityIndex + 1);
+                    }
+                }, 300);
+            }
+        }
+    }
+
+    get currentImageContainer() {
+        if (this.mouseDown) {
+            return this.elements.scrubbing.container;
+        }
+
+        return this.elements.thumb.imageContainer;
+    }
+
+    get usingSprites() {
+        return Object.keys(this.thumbnails[0].frames[0]).includes('w');
+    }
+
+    get thumbAspectRatio() {
+        if (this.usingSprites) {
+            return this.thumbnails[0].frames[0].w / this.thumbnails[0].frames[0].h;
+        }
+
+        return this.thumbnails[0].width / this.thumbnails[0].height;
+    }
+
+    get thumbContainerHeight() {
+        if (this.mouseDown) {
+            // Can't use media.clientHeight - HTML5 video goes big and does black bars above and below
+            return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio);
+        }
+
+        return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio / 4);
+    }
+
+    get currentImageElement() {
+        if (this.mouseDown) {
+            return this.currentScrubbingImageElement;
+        }
+
+        return this.currentThumbnailImageElement;
+    }
+
+    set currentImageElement(element) {
+        if (this.mouseDown) {
+            this.currentScrubbingImageElement = element;
+        } else {
+            this.currentThumbnailImageElement = element;
+        }
+    }
+
+    toggleThumbContainer(toggle = false, clearShowing = false) {
+        const className = this.player.config.classNames.previewThumbnails.thumbContainerShown;
+        this.elements.thumb.container.classList.toggle(className, toggle);
+
+        if (!toggle && clearShowing) {
+            this.showingThumb = null;
+            this.showingThumbFilename = null;
+        }
+    }
+
+    toggleScrubbingContainer(toggle = false) {
+        const className = this.player.config.classNames.previewThumbnails.scrubbingContainerShown;
+        this.elements.scrubbing.container.classList.toggle(className, toggle);
+
+        if (!toggle) {
+            this.showingThumb = null;
+            this.showingThumbFilename = null;
+        }
+    }
+
+    determineContainerAutoSizing() {
+        if (this.elements.thumb.imageContainer.clientHeight > 20) {
+            // This will prevent auto sizing in this.setThumbContainerSizeAndPos()
+            this.sizeSpecifiedInCSS = true;
+        }
+    }
+
+    // Set the size to be about a quarter of the size of video. Unless option dynamicSize === false, in which case it needs to be set in CSS
+    setThumbContainerSizeAndPos() {
+        if (!this.sizeSpecifiedInCSS) {
+            const thumbWidth = Math.floor(this.thumbContainerHeight * this.thumbAspectRatio);
+            this.elements.thumb.imageContainer.style.height = `${this.thumbContainerHeight}px`;
+            this.elements.thumb.imageContainer.style.width = `${thumbWidth}px`;
+        }
+
+        this.setThumbContainerPos();
+    }
+
+    setThumbContainerPos() {
+        const seekbarRect = this.player.elements.progress.getBoundingClientRect();
+        const plyrRect = this.player.elements.container.getBoundingClientRect();
+        const { container } = this.elements.thumb;
+
+        // Find the lowest and highest desired left-position, so we don't slide out the side of the video container
+        const minVal = plyrRect.left - seekbarRect.left + 10;
+        const maxVal = plyrRect.right - seekbarRect.left - container.clientWidth - 10;
+
+        // Set preview container position to: mousepos, minus seekbar.left, minus half of previewContainer.clientWidth
+        let previewPos = this.mousePosX - seekbarRect.left - container.clientWidth / 2;
+
+        if (previewPos < minVal) {
+            previewPos = minVal;
+        }
+
+        if (previewPos > maxVal) {
+            previewPos = maxVal;
+        }
+
+        container.style.left = `${previewPos}px`;
+    }
+
+    // Can't use 100% width, in case the video is a different aspect ratio to the video container
+    setScrubbingContainerSize() {
+        this.elements.scrubbing.container.style.width = `${this.player.media.clientWidth}px`;
+        // Can't use media.clientHeight - html5 video goes big and does black bars above and below
+        this.elements.scrubbing.container.style.height = `${this.player.media.clientWidth / this.thumbAspectRatio}px`;
+    }
+
+    // Sprites need to be offset to the correct location
+    setImageSizeAndOffset(previewImage, frame) {
+        if (!this.usingSprites) {
+            return;
+        }
+
+        // Find difference between height and preview container height
+        const multiplier = this.thumbContainerHeight / frame.h;
+
+        previewImage.style.height = `${Math.floor(previewImage.naturalHeight * multiplier)}px`;
+        previewImage.style.width = `${Math.floor(previewImage.naturalWidth * multiplier)}px`;
+        previewImage.style.left = `-${frame.x * multiplier}px`;
+        previewImage.style.top = `-${frame.y * multiplier}px`;
+    }
+}
+
+export default PreviewThumbnails;
diff --git a/src/js/plugins/vimeo.js b/src/js/plugins/vimeo.js
index 2d9ba6e2..a7664e73 100644
--- a/src/js/plugins/vimeo.js
+++ b/src/js/plugins/vimeo.js
@@ -10,7 +10,9 @@ import { triggerEvent } from '../utils/events';
 import fetch from '../utils/fetch';
 import is from '../utils/is';
 import loadScript from '../utils/loadScript';
+import { extend } from '../utils/objects';
 import { format, stripHTML } from '../utils/strings';
+import { setAspectRatio } from '../utils/style';
 import { buildUrlParams } from '../utils/urls';
 
 // Parse Vimeo ID from URL
@@ -27,13 +29,6 @@ function parseId(url) {
     return url.match(regex) ? RegExp.$2 : url;
 }
 
-// Get aspect ratio for dimensions
-function getAspectRatio(width, height) {
-    const getRatio = (w, h) => (h === 0 ? w : getRatio(h, w % h));
-    const ratio = getRatio(width, height);
-    return `${width / ratio}:${height / ratio}`;
-}
-
 // Set playback state and trigger change (only on actual change)
 function assurePlaybackState(play) {
     if (play && !this.embed.hasPlayed) {
@@ -51,7 +46,7 @@ const vimeo = {
         toggleClass(this.elements.wrapper, this.config.classNames.embed, true);
 
         // Set intial ratio
-        vimeo.setAspectRatio.call(this);
+        setAspectRatio.call(this);
 
         // Load the API if not already
         if (!is.object(window.Vimeo)) {
@@ -67,40 +62,25 @@ const vimeo = {
         }
     },
 
-    // Set aspect ratio
-    // For Vimeo we have an extra 300% height <div> to hide the standard controls and UI
-    setAspectRatio(input) {
-        const [x, y] = (is.string(input) ? input : this.config.ratio).split(':').map(Number);
-        const padding = (100 / x) * y;
-        vimeo.padding = padding;
-        this.elements.wrapper.style.paddingBottom = `${padding}%`;
-
-        if (this.supported.ui) {
-            const height = 240;
-            const offset = (height - padding) / (height / 50);
-
-            this.media.style.transform = `translateY(-${offset}%)`;
-        }
-    },
-
     // API Ready
     ready() {
         const player = this;
+        const config = player.config.vimeo;
 
         // Get Vimeo params for the iframe
-        const options = {
-            loop: player.config.loop.active,
-            autoplay: player.autoplay,
-            // muted: player.muted,
-            byline: false,
-            portrait: false,
-            title: false,
-            speed: true,
-            transparent: 0,
-            gesture: 'media',
-            playsinline: !this.config.fullscreen.iosNative,
-        };
-        const params = buildUrlParams(options);
+        const params = buildUrlParams(
+            extend(
+                {},
+                {
+                    loop: player.config.loop.active,
+                    autoplay: player.autoplay,
+                    muted: player.muted,
+                    gesture: 'media',
+                    playsinline: !this.config.fullscreen.iosNative,
+                },
+                config,
+            ),
+        );
 
         // Get the source URL or ID
         let source = player.media.getAttribute('src');
@@ -300,8 +280,9 @@ const vimeo = {
 
         // Set aspect ratio based on video size
         Promise.all([player.embed.getVideoWidth(), player.embed.getVideoHeight()]).then(dimensions => {
-            vimeo.ratio = getAspectRatio(dimensions[0], dimensions[1]);
-            vimeo.setAspectRatio.call(this, vimeo.ratio);
+            const [width, height] = dimensions;
+            player.embed.ratio = `${width}:${height}`;
+            setAspectRatio.call(this, player.embed.ratio);
         });
 
         // Set autopause
@@ -405,22 +386,6 @@ const vimeo = {
             triggerEvent.call(player, player.media, 'error');
         });
 
-        // Set height/width on fullscreen
-        player.on('enterfullscreen exitfullscreen', event => {
-            const { target } = player.fullscreen;
-
-            // Ignore for iOS native
-            if (target !== player.elements.container) {
-                return;
-            }
-
-            const toggle = event.type === 'enterfullscreen';
-            const [x, y] = vimeo.ratio.split(':').map(Number);
-            const dimension = x > y ? 'width' : 'height';
-
-            target.style[dimension] = toggle ? `${vimeo.padding}%` : null;
-        });
-
         // Rebuild UI
         setTimeout(() => ui.build.call(player), 0);
     },
diff --git a/src/js/plugins/youtube.js b/src/js/plugins/youtube.js
index 73175c14..d5972c80 100644
--- a/src/js/plugins/youtube.js
+++ b/src/js/plugins/youtube.js
@@ -9,7 +9,9 @@ import fetch from '../utils/fetch';
 import is from '../utils/is';
 import loadImage from '../utils/loadImage';
 import loadScript from '../utils/loadScript';
+import { extend } from '../utils/objects';
 import { format, generateId } from '../utils/strings';
+import { setAspectRatio } from '../utils/style';
 
 // Parse YouTube ID from URL
 function parseId(url) {
@@ -38,7 +40,7 @@ const youtube = {
         toggleClass(this.elements.wrapper, this.config.classNames.embed, true);
 
         // Set aspect ratio
-        youtube.setAspectRatio.call(this);
+        setAspectRatio.call(this);
 
         // Setup API
         if (is.object(window.YT) && is.function(window.YT.Player)) {
@@ -98,12 +100,6 @@ const youtube = {
         }
     },
 
-    // Set aspect ratio
-    setAspectRatio() {
-        const ratio = this.config.ratio.split(':');
-        this.elements.wrapper.style.paddingBottom = `${100 / ratio[0] * ratio[1]}%`;
-    },
-
     // API ready
     ready() {
         const player = this;
@@ -134,7 +130,7 @@ const youtube = {
         player.media = replaceElement(container, player.media);
 
         // Id to poster wrapper
-        const posterSrc = format => `https://img.youtube.com/vi/${videoId}/${format}default.jpg`;
+        const posterSrc = format => `https://i.ytimg.com/vi/${videoId}/${format}default.jpg`;
 
         // Check thumbnail images in order of quality, but reject fallback thumbnails (120px wide)
         loadImage(posterSrc('maxres'), 121) // Higest quality and unpadded
@@ -149,29 +145,29 @@ const youtube = {
             })
             .catch(() => {});
 
+        const config = player.config.youtube;
+
         // Setup instance
         // https://developers.google.com/youtube/iframe_api_reference
         player.embed = new window.YT.Player(id, {
             videoId,
-            playerVars: {
-                autoplay: player.config.autoplay ? 1 : 0, // Autoplay
-                hl: player.config.hl, // iframe interface language
-                controls: player.supported.ui ? 0 : 1, // Only show controls if not fully supported
-                rel: 0, // No related vids
-                showinfo: 0, // Hide info
-                iv_load_policy: 3, // Hide annotations
-                modestbranding: 1, // Hide logos as much as possible (they still show one in the corner when paused)
-                disablekb: 1, // Disable keyboard as we handle it
-                playsinline: 1, // Allow iOS inline playback
-
-                // Tracking for stats
-                // origin: window ? `${window.location.protocol}//${window.location.host}` : null,
-                widget_referrer: window ? window.location.href : null,
-
-                // Captions are flaky on YouTube
-                cc_load_policy: player.captions.active ? 1 : 0,
-                cc_lang_pref: player.config.captions.language,
-            },
+            host: config.noCookie ? 'https://www.youtube-nocookie.com' : undefined,
+            playerVars: extend(
+                {},
+                {
+                    autoplay: player.config.autoplay ? 1 : 0, // Autoplay
+                    hl: player.config.hl, // iframe interface language
+                    controls: player.supported.ui ? 0 : 1, // Only show controls if not fully supported
+                    disablekb: 1, // Disable keyboard as we handle it
+                    playsinline: !player.config.fullscreen.iosNative ? 1 : 0, // Allow iOS inline playback
+                    // Captions are flaky on YouTube
+                    cc_load_policy: player.captions.active ? 1 : 0,
+                    cc_lang_pref: player.config.captions.language,
+                    // Tracking for stats
+                    widget_referrer: window ? window.location.href : null,
+                },
+                config,
+            ),
             events: {
                 onError(event) {
                     // YouTube may fire onError twice, so only handle it once
diff --git a/src/js/plyr.js b/src/js/plyr.js
index c8154429..0d3d1674 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v3.4.7
+// plyr.js v3.5.2
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -15,6 +15,7 @@ import Fullscreen from './fullscreen';
 import Listeners from './listeners';
 import media from './media';
 import Ads from './plugins/ads';
+import PreviewThumbnails from './plugins/previewThumbnails';
 import source from './source';
 import Storage from './storage';
 import support from './support';
@@ -187,7 +188,7 @@ class Plyr {
                         // YouTube requires the playsinline in the URL
                         if (this.isYouTube) {
                             this.config.playsinline = truthy.includes(url.searchParams.get('playsinline'));
-                            this.config.hl = url.searchParams.get('hl'); // TODO: Should this be setting language?
+                            this.config.youtube.hl = url.searchParams.get('hl'); // TODO: Should this be setting language?
                         } else {
                             this.config.playsinline = true;
                         }
@@ -262,7 +263,7 @@ class Plyr {
 
         // Wrap media
         if (!is.element(this.elements.container)) {
-            this.elements.container = createElement('div');
+            this.elements.container = createElement('div', { tabindex: 0 });
             wrap(this.media, this.elements.container);
         }
 
@@ -306,6 +307,11 @@ class Plyr {
 
         // Seek time will be recorded (in listeners.js) so we can prevent hiding controls for a few seconds after seek
         this.lastSeekTime = 0;
+
+        // Setup preview thumbnails if enabled
+        if (this.config.previewThumbnails.enabled) {
+            this.previewThumbnails = new PreviewThumbnails(this);
+        }
     }
 
     // ---------------------------------------
@@ -347,6 +353,11 @@ class Plyr {
             return null;
         }
 
+        // Intecept play with ads
+        if (this.ads && this.ads.enabled) {
+            this.ads.managerPromise.then(() => this.ads.play()).catch(() => this.media.play());
+        }
+
         // Return the promise (for HTML5)
         return this.media.play();
     }
@@ -392,7 +403,7 @@ class Plyr {
 
     /**
      * Toggle playback based on current status
-     * @param {boolean} input
+     * @param {Boolean} input
      */
     togglePlay(input) {
         // Toggle based on current state if nothing passed
@@ -426,7 +437,7 @@ class Plyr {
 
     /**
      * Rewind
-     * @param {number} seekTime - how far to rewind in seconds. Defaults to the config.seekTime
+     * @param {Number} seekTime - how far to rewind in seconds. Defaults to the config.seekTime
      */
     rewind(seekTime) {
         this.currentTime = this.currentTime - (is.number(seekTime) ? seekTime : this.config.seekTime);
@@ -434,7 +445,7 @@ class Plyr {
 
     /**
      * Fast forward
-     * @param {number} seekTime - how far to fast forward in seconds. Defaults to the config.seekTime
+     * @param {Number} seekTime - how far to fast forward in seconds. Defaults to the config.seekTime
      */
     forward(seekTime) {
         this.currentTime = this.currentTime + (is.number(seekTime) ? seekTime : this.config.seekTime);
@@ -442,7 +453,7 @@ class Plyr {
 
     /**
      * Seek to a time
-     * @param {number} input - where to seek to in seconds. Defaults to 0 (the start)
+     * @param {Number} input - where to seek to in seconds. Defaults to 0 (the start)
      */
     set currentTime(input) {
         // Bail if media duration isn't available yet
@@ -512,7 +523,7 @@ class Plyr {
 
     /**
      * Set the player volume
-     * @param {number} value - must be between 0 and 1. Defaults to the value from local storage and config.volume if not set in storage
+     * @param {Number} value - must be between 0 and 1. Defaults to the value from local storage and config.volume if not set in storage
      */
     set volume(value) {
         let volume = value;
@@ -563,7 +574,7 @@ class Plyr {
 
     /**
      * Increase volume
-     * @param {boolean} step - How much to decrease by (between 0 and 1)
+     * @param {Boolean} step - How much to decrease by (between 0 and 1)
      */
     increaseVolume(step) {
         const volume = this.media.muted ? 0 : this.volume;
@@ -572,7 +583,7 @@ class Plyr {
 
     /**
      * Decrease volume
-     * @param {boolean} step - How much to decrease by (between 0 and 1)
+     * @param {Boolean} step - How much to decrease by (between 0 and 1)
      */
     decreaseVolume(step) {
         this.increaseVolume(-step);
@@ -580,7 +591,7 @@ class Plyr {
 
     /**
      * Set muted state
-     * @param {boolean} mute
+     * @param {Boolean} mute
      */
     set muted(mute) {
         let toggle = mute;
@@ -632,7 +643,7 @@ class Plyr {
 
     /**
      * Set playback speed
-     * @param {number} speed - the speed of playback (0.5-2.0)
+     * @param {Number} speed - the speed of playback (0.5-2.0)
      */
     set speed(input) {
         let speed = null;
@@ -679,7 +690,7 @@ class Plyr {
     /**
      * Set playback quality
      * Currently HTML5 & YouTube only
-     * @param {number} input - Quality level
+     * @param {Number} input - Quality level
      */
     set quality(input) {
         const config = this.config.quality;
@@ -729,7 +740,7 @@ class Plyr {
     /**
      * Toggle loop
      * TODO: Finish fancy new logic. Set the indicator on load as user may pass loop as config
-     * @param {boolean} input - Whether to loop or not
+     * @param {Boolean} input - Whether to loop or not
      */
     set loop(input) {
         const toggle = is.boolean(input) ? input : this.config.loop.active;
@@ -789,7 +800,7 @@ class Plyr {
 
     /**
      * Set new media source
-     * @param {object} input - The new source object (see docs)
+     * @param {Object} input - The new source object (see docs)
      */
     set source(input) {
         source.change.call(this, input);
@@ -813,7 +824,7 @@ class Plyr {
 
     /**
      * Set the poster image for a video
-     * @param {input} - the URL for the new poster image
+     * @param {String} input - the URL for the new poster image
      */
     set poster(input) {
         if (!this.isVideo) {
@@ -837,7 +848,7 @@ class Plyr {
 
     /**
      * Set the autoplay state
-     * @param {boolean} input - Whether to autoplay or not
+     * @param {Boolean} input - Whether to autoplay or not
      */
     set autoplay(input) {
         const toggle = is.boolean(input) ? input : this.config.autoplay;
@@ -853,7 +864,7 @@ class Plyr {
 
     /**
      * Toggle captions
-     * @param {boolean} input - Whether to enable captions
+     * @param {Boolean} input - Whether to enable captions
      */
     toggleCaptions(input) {
         captions.toggle.call(this, input, false);
@@ -861,7 +872,7 @@ class Plyr {
 
     /**
      * Set the caption track by index
-     * @param {number} - Caption index
+     * @param {Number} - Caption index
      */
     set currentTrack(input) {
         captions.set.call(this, input, false);
@@ -878,7 +889,7 @@ class Plyr {
     /**
      * Set the wanted language for captions
      * Since tracks can be added later it won't update the actual caption track until there is a matching track
-     * @param {string} - Two character ISO language code (e.g. EN, FR, PT, etc)
+     * @param {String} - Two character ISO language code (e.g. EN, FR, PT, etc)
      */
     set language(input) {
         captions.setLanguage.call(this, input, false);
@@ -951,7 +962,7 @@ class Plyr {
 
     /**
      * Toggle the player controls
-     * @param {boolean} [toggle] - Whether to show the controls
+     * @param {Boolean} [toggle] - Whether to show the controls
      */
     toggleControls(toggle) {
         // Don't toggle if missing UI support or if it's audio
@@ -984,8 +995,8 @@ class Plyr {
 
     /**
      * Add event listeners
-     * @param {string} event - Event type
-     * @param {function} callback - Callback for when event occurs
+     * @param {String} event - Event type
+     * @param {Function} callback - Callback for when event occurs
      */
     on(event, callback) {
         on.call(this, this.elements.container, event, callback);
@@ -993,8 +1004,8 @@ class Plyr {
 
     /**
      * Add event listeners once
-     * @param {string} event - Event type
-     * @param {function} callback - Callback for when event occurs
+     * @param {String} event - Event type
+     * @param {Function} callback - Callback for when event occurs
      */
     once(event, callback) {
         once.call(this, this.elements.container, event, callback);
@@ -1002,8 +1013,8 @@ class Plyr {
 
     /**
      * Remove event listeners
-     * @param {string} event - Event type
-     * @param {function} callback - Callback for when event occurs
+     * @param {String} event - Event type
+     * @param {Function} callback - Callback for when event occurs
      */
     off(event, callback) {
         off(this.elements.container, event, callback);
@@ -1013,8 +1024,8 @@ class Plyr {
      * Destroy an instance
      * Event listeners are removed when elements are removed
      * http://stackoverflow.com/questions/12528049/if-a-dom-element-is-removed-are-its-listeners-also-removed-from-memory
-     * @param {function} callback - Callback for when destroy is complete
-     * @param {boolean} soft - Whether it's a soft destroy (for source changes etc)
+     * @param {Function} callback - Callback for when destroy is complete
+     * @param {Boolean} soft - Whether it's a soft destroy (for source changes etc)
      */
     destroy(callback, soft = false) {
         if (!this.ready) {
@@ -1113,7 +1124,7 @@ class Plyr {
 
     /**
      * Check for support for a mime type (HTML5 only)
-     * @param {string} type - Mime type
+     * @param {String} type - Mime type
      */
     supports(type) {
         return support.mime.call(this, type);
@@ -1121,9 +1132,9 @@ class Plyr {
 
     /**
      * Check for support
-     * @param {string} type - Player type (audio/video)
-     * @param {string} provider - Provider (html5/youtube/vimeo)
-     * @param {bool} inline - Where player has `playsinline` sttribute
+     * @param {String} type - Player type (audio/video)
+     * @param {String} provider - Provider (html5/youtube/vimeo)
+     * @param {Boolean} inline - Where player has `playsinline` sttribute
      */
     static supported(type, provider, inline) {
         return support.check(type, provider, inline);
@@ -1131,8 +1142,8 @@ class Plyr {
 
     /**
      * Load an SVG sprite into the page
-     * @param {string} url - URL for the SVG sprite
-     * @param {string} [id] - Unique ID
+     * @param {String} url - URL for the SVG sprite
+     * @param {String} [id] - Unique ID
      */
     static loadSprite(url, id) {
         return loadSprite(url, id);
@@ -1141,7 +1152,7 @@ class Plyr {
     /**
      * Setup multiple instances
      * @param {*} selector
-     * @param {object} options
+     * @param {Object} options
      */
     static setup(selector, options = {}) {
         let targets = null;
diff --git a/src/js/plyr.polyfilled.js b/src/js/plyr.polyfilled.js
index ac6d1c28..8623e41a 100644
--- a/src/js/plyr.polyfilled.js
+++ b/src/js/plyr.polyfilled.js
@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr Polyfilled Build
-// plyr.js v3.4.7
+// plyr.js v3.5.2
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
diff --git a/src/js/source.js b/src/js/source.js
index 337c949c..0173cc9e 100644
--- a/src/js/source.js
+++ b/src/js/source.js
@@ -125,11 +125,16 @@ const source = {
                     ui.build.call(this);
                 }
 
+                // Load HTML5 sources
                 if (this.isHTML5) {
-                    // Load HTML5 sources
                     this.media.load();
                 }
 
+                // Reload thumbnails
+                if (this.previewThumbnails) {
+                    this.previewThumbnails.load();
+                }
+
                 // Update the fullscreen support
                 this.fullscreen.update();
             },
diff --git a/src/js/support.js b/src/js/support.js
index 9257df13..81965867 100644
--- a/src/js/support.js
+++ b/src/js/support.js
@@ -68,9 +68,13 @@ const support = {
     // Check for mime type support against a player instance
     // Credits: http://diveintohtml5.info/everything.html
     // Related: http://www.leanbackplayer.com/test/h5mt.html
-    mime(inputType) {
-        const [mediaType] = inputType.split('/');
-        let type = inputType;
+    mime(input) {
+        if (is.empty(input)) {
+            return false;
+        }
+
+        const [mediaType] = input.split('/');
+        let type = input;
 
         // Verify we're using HTML5 and there's no media type mismatch
         if (!this.isHTML5 || mediaType !== this.type) {
@@ -79,7 +83,7 @@ const support = {
 
         // Add codec if required
         if (Object.keys(defaultCodecs).includes(type)) {
-            type += `; codecs="${defaultCodecs[inputType]}"`;
+            type += `; codecs="${defaultCodecs[input]}"`;
         }
 
         try {
diff --git a/src/js/utils/browser.js b/src/js/utils/browser.js
index d574f683..11705074 100644
--- a/src/js/utils/browser.js
+++ b/src/js/utils/browser.js
@@ -5,6 +5,7 @@
 
 const browser = {
     isIE: /* @cc_on!@ */ false || !!document.documentMode,
+    isEdge: window.navigator.userAgent.includes('Edge'),
     isWebkit: 'WebkitAppearance' in document.documentElement.style && !/Edge/.test(navigator.userAgent),
     isIPhone: /(iPhone|iPod)/gi.test(navigator.platform),
     isIos: /(iPad|iPhone|iPod)/gi.test(navigator.platform),
diff --git a/src/js/utils/events.js b/src/js/utils/events.js
index 9f734f04..d304c312 100644
--- a/src/js/utils/events.js
+++ b/src/js/utils/events.js
@@ -73,10 +73,10 @@ export function off(element, events = '', callback, passive = true, capture = fa
 
 // Bind once-only event handler
 export function once(element, events = '', callback, passive = true, capture = false) {
-    function onceCallback(...args) {
+    const onceCallback = (...args) => {
         off(element, events, onceCallback, passive, capture);
         callback.apply(this, args);
-    }
+    };
 
     toggleListener.call(this, element, events, onceCallback, true, passive, capture);
 }
@@ -114,7 +114,7 @@ export function unbindListeners() {
 
 // Run method when / if player is ready
 export function ready() {
-    return new Promise(
-        resolve => (this.ready ? setTimeout(resolve, 0) : on.call(this, this.elements.container, 'ready', resolve)),
+    return new Promise(resolve =>
+        this.ready ? setTimeout(resolve, 0) : on.call(this, this.elements.container, 'ready', resolve),
     ).then(() => {});
 }
diff --git a/src/js/utils/is.js b/src/js/utils/is.js
index ab28f2ab..b005cd31 100644
--- a/src/js/utils/is.js
+++ b/src/js/utils/is.js
@@ -19,6 +19,7 @@ const isEvent = input => instanceOf(input, Event);
 const isKeyboardEvent = input => instanceOf(input, KeyboardEvent);
 const isCue = input => instanceOf(input, window.TextTrackCue) || instanceOf(input, window.VTTCue);
 const isTrack = input => instanceOf(input, TextTrack) || (!isNullOrUndefined(input) && isString(input.kind));
+const isPromise = input => instanceOf(input, Promise);
 
 const isEmpty = input =>
     isNullOrUndefined(input) ||
@@ -65,6 +66,7 @@ export default {
     keyboardEvent: isKeyboardEvent,
     cue: isCue,
     track: isTrack,
+    promise: isPromise,
     url: isUrl,
     empty: isEmpty,
 };
diff --git a/src/js/utils/style.js b/src/js/utils/style.js
new file mode 100644
index 00000000..a8eb393b
--- /dev/null
+++ b/src/js/utils/style.js
@@ -0,0 +1,40 @@
+// ==========================================================================
+// Style utils
+// ==========================================================================
+
+import is from './is';
+
+/* function reduceAspectRatio(width, height) {
+    const getRatio = (w, h) => (h === 0 ? w : getRatio(h, w % h));
+    const ratio = getRatio(width, height);
+    return `${width / ratio}:${height / ratio}`;
+} */
+
+// Set aspect ratio for responsive container
+export function setAspectRatio(input) {
+    let ratio = input;
+
+    if (!is.string(ratio) && !is.nullOrUndefined(this.embed)) {
+        ({ ratio } = this.embed);
+    }
+
+    if (!is.string(ratio)) {
+        ({ ratio } = this.config);
+    }
+
+    const [x, y] = ratio.split(':').map(Number);
+    const padding = (100 / x) * y;
+
+    this.elements.wrapper.style.paddingBottom = `${padding}%`;
+
+    // For Vimeo we have an extra <div> to hide the standard controls and UI
+    if (this.isVimeo && this.supported.ui) {
+        const height = 240;
+        const offset = (height - padding) / (height / 50);
+        this.media.style.transform = `translateY(-${offset}%)`;
+    }
+
+    return { padding, ratio };
+}
+
+export default { setAspectRatio };
diff --git a/src/js/utils/time.js b/src/js/utils/time.js
index 7c9860fd..2deccf65 100644
--- a/src/js/utils/time.js
+++ b/src/js/utils/time.js
@@ -5,9 +5,9 @@
 import is from './is';
 
 // Time helpers
-export const getHours = value => parseInt((value / 60 / 60) % 60, 10);
-export const getMinutes = value => parseInt((value / 60) % 60, 10);
-export const getSeconds = value => parseInt(value % 60, 10);
+export const getHours = value => Math.trunc((value / 60 / 60) % 60, 10);
+export const getMinutes = value => Math.trunc((value / 60) % 60, 10);
+export const getSeconds = value => Math.trunc(value % 60, 10);
 
 // Format time to UI friendly string
 export function formatTime(time = 0, displayHours = false, inverted = false) {
diff --git a/src/js/utils/urls.js b/src/js/utils/urls.js
index 3ebe622e..843c6aa6 100644
--- a/src/js/utils/urls.js
+++ b/src/js/utils/urls.js
@@ -6,8 +6,8 @@ import is from './is';
 
 /**
  * Parse a string to a URL object
- * @param {string} input - the URL to be parsed
- * @param {boolean} safe - failsafe parsing
+ * @param {String} input - the URL to be parsed
+ * @param {Boolean} safe - failsafe parsing
  */
 export function parseUrl(input, safe = true) {
     let url = input;
diff --git a/src/sass/components/progress.scss b/src/sass/components/progress.scss
index 16992808..f28a19ca 100644
--- a/src/sass/components/progress.scss
+++ b/src/sass/components/progress.scss
@@ -42,13 +42,13 @@
 
     &::-webkit-progress-bar {
         background: transparent;
-        transition: width 0.2s ease;
     }
 
     &::-webkit-progress-value {
         background: currentColor;
         border-radius: 100px;
         min-width: $plyr-range-track-height;
+        transition: width 0.2s ease;
     }
 
     // Mozilla
diff --git a/src/sass/lib/mixins.scss b/src/sass/lib/mixins.scss
index 0a0f7dcb..acd8af1e 100644
--- a/src/sass/lib/mixins.scss
+++ b/src/sass/lib/mixins.scss
@@ -69,11 +69,6 @@
         width: 100%;
     }
 
-    .plyr__video-embed {
-        // Revert overflow change
-        overflow: visible;
-    }
-
     // Vimeo requires some different styling
     &.plyr--vimeo .plyr__video-wrapper {
         height: 0;
diff --git a/src/sass/plugins/previewThumbnails.scss b/src/sass/plugins/previewThumbnails.scss
new file mode 100644
index 00000000..02a2f619
--- /dev/null
+++ b/src/sass/plugins/previewThumbnails.scss
@@ -0,0 +1,118 @@
+// --------------------------------------------------------------
+// Preview Thumbnails
+// --------------------------------------------------------------
+
+$plyr-preview-padding: $plyr-tooltip-padding !default;
+$plyr-preview-bg: $plyr-tooltip-bg !default;
+$plyr-preview-radius: $plyr-tooltip-radius !default;
+$plyr-preview-shadow: $plyr-tooltip-shadow !default;
+$plyr-preview-arrow-size: $plyr-tooltip-arrow-size !default;
+$plyr-preview-image-bg: $plyr-color-heather !default;
+$plyr-preview-time-font-size: $plyr-font-size-time !default;
+$plyr-preview-time-padding: 3px 6px !default;
+$plyr-preview-time-bg: rgba(0, 0, 0, 0.55);
+$plyr-preview-time-color: #fff;
+$plyr-preview-time-bottom-offset: 6px;
+
+.plyr__preview-thumb {
+    background-color: $plyr-preview-bg;
+    border-radius: 3px;
+    bottom: 100%;
+    box-shadow: $plyr-preview-shadow;
+    margin-bottom: $plyr-preview-padding * 2;
+    opacity: 0;
+    padding: $plyr-preview-radius;
+    pointer-events: none;
+    position: absolute;
+    transform: translate(0, 10px) scale(0.8);
+    transform-origin: 50% 100%;
+    transition: transform 0.2s 0.1s ease, opacity 0.2s 0.1s ease;
+    z-index: 2;
+
+    &--is-shown {
+        opacity: 1;
+        transform: translate(0, 0) scale(1);
+    }
+
+    // The background triangle
+    &::before {
+        border-left: $plyr-preview-arrow-size solid transparent;
+        border-right: $plyr-preview-arrow-size solid transparent;
+        border-top: $plyr-preview-arrow-size solid $plyr-preview-bg;
+        bottom: -$plyr-preview-arrow-size;
+        content: '';
+        height: 0;
+        left: 50%;
+        position: absolute;
+        transform: translateX(-50%);
+        width: 0;
+        z-index: 2;
+    }
+
+    &__image-container {
+        background: $plyr-preview-image-bg;
+        border-radius: ($plyr-preview-radius - 1px);
+        overflow: hidden;
+        position: relative;
+        z-index: 0;
+
+        img {
+            height: 100%; // Non sprite images are 100%. Sprites will have their size applied by JavaScript
+            left: 0;
+            max-height: none;
+            max-width: none;
+            position: absolute;
+            top: 0;
+            width: 100%;
+        }
+    }
+
+    // Seek time text
+    &__time-container {
+        bottom: $plyr-preview-time-bottom-offset;
+        left: 0;
+        position: absolute;
+        right: 0;
+        white-space: nowrap;
+        z-index: 3;
+
+        span {
+            background-color: $plyr-preview-time-bg;
+            border-radius: ($plyr-preview-radius - 1px);
+            color: $plyr-preview-time-color;
+            font-size: $plyr-preview-time-font-size;
+            padding: $plyr-preview-time-padding;
+        }
+    }
+}
+
+.plyr__preview-scrubbing {
+    bottom: 0;
+    filter: blur(1px);
+    height: 100%;
+    left: 0;
+    margin: auto; // Required when video is different dimensions to container (e.g. fullscreen)
+    opacity: 0;
+    overflow: hidden;
+    position: absolute;
+    right: 0;
+    top: 0;
+    transition: opacity 0.3s ease;
+    width: 100%;
+    z-index: 1;
+
+    &--is-shown {
+        opacity: 1;
+    }
+
+    img {
+        height: 100%;
+        left: 0;
+        max-height: none;
+        max-width: none;
+        object-fit: contain;
+        position: absolute;
+        top: 0;
+        width: 100%;
+    }
+}
diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss
index 7c36c307..7d69871c 100644
--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@@ -45,6 +45,7 @@ $css-vars-use-native: true;
 @import 'states/fullscreen';
 
 @import 'plugins/ads';
+@import 'plugins/previewThumbnails';
 
 @import 'utils/animation';
 @import 'utils/hidden';
diff --git a/src/sass/settings/sliders.scss b/src/sass/settings/sliders.scss
index 3ad44534..3d77f485 100644
--- a/src/sass/settings/sliders.scss
+++ b/src/sass/settings/sliders.scss
@@ -6,13 +6,13 @@
 $plyr-range-thumb-active-shadow-width: 3px !default;
 
 // Thumb
-$plyr-range-thumb-height: 14px !default;
+$plyr-range-thumb-height: 13px !default;
 $plyr-range-thumb-bg: #fff !default;
 $plyr-range-thumb-border: 2px solid transparent !default;
 $plyr-range-thumb-shadow: 0 1px 1px rgba(#000, 0.15), 0 0 0 1px rgba($plyr-color-gunmetal, 0.2) !default;
 
 // Track
-$plyr-range-track-height: 4px !default;
+$plyr-range-track-height: 5px !default;
 $plyr-range-max-height: ($plyr-range-thumb-active-shadow-width * 2) + $plyr-range-thumb-height !default;
 
 // Fill