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
This commit is contained in:
@ -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);
|
||||
|
Reference in New Issue
Block a user