Merge branch 'develop' into css-variables

# Conflicts:
#	src/js/captions.js
#	src/js/config/defaults.js
#	src/js/fullscreen.js
#	src/js/listeners.js
#	src/js/plyr.js

1 files changed, 4 insertions, 3 deletions

diff --git a/src/js/plyr.js b/src/js/plyr.js
index 14050929..a3bdb285 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -80,6 +80,7 @@ class Plyr {
     // Elements cache
     this.elements = {
       container: null,
+      fullscreen: null,
       captions: null,
       buttons: {},
       display: {},
@@ -285,6 +286,9 @@ class Plyr {
       });
     }
 
+    // Setup fullscreen
+    this.fullscreen = new Fullscreen(this);
+
     // Setup interface
     // If embed but not fully supported, build interface now to avoid flash of controls
     if (this.isHTML5 || (this.isEmbed && !this.supported.ui)) {
@@ -297,9 +301,6 @@ class Plyr {
     // Global listeners
     this.listeners.global();
 
-    // Setup fullscreen
-    this.fullscreen = new Fullscreen(this);
-
     // Setup ads if provided
     if (this.config.ads.enabled) {
       this.ads = new Ads(this);