Merge branch 'develop' into css-variables

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

1 files changed, 37 insertions, 2 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)
     },
 };