diff options
author | Sam Potts <sam@potts.es> | 2018-04-27 18:35:06 +1000 |
---|---|---|
committer | Sam Potts <sam@potts.es> | 2018-04-27 18:35:06 +1000 |
commit | 24d833a5d1ad7c98bfce676c3aaf219381a4bdee (patch) | |
tree | 164e859f5ecb53fc416f0c1d29103f3f37dbda76 /src/js/fullscreen.js | |
parent | e1183d604950163fd7a3bfb1a99573beeb89ec92 (diff) | |
parent | 44b30380f71f03c8944e42b24c7ce3e92a0f2eea (diff) | |
download | plyr-24d833a5d1ad7c98bfce676c3aaf219381a4bdee.tar.lz plyr-24d833a5d1ad7c98bfce676c3aaf219381a4bdee.tar.xz plyr-24d833a5d1ad7c98bfce676c3aaf219381a4bdee.zip |
Merge branch 'master' into develop
Diffstat (limited to 'src/js/fullscreen.js')
-rw-r--r-- | src/js/fullscreen.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/js/fullscreen.js b/src/js/fullscreen.js index 8795f460..cd2d8ac6 100644 --- a/src/js/fullscreen.js +++ b/src/js/fullscreen.js @@ -55,7 +55,7 @@ class Fullscreen { // Get prefix this.prefix = Fullscreen.prefix; - this.name = Fullscreen.name; + this.property = Fullscreen.property; // Scroll position this.scrollPosition = { x: 0, y: 0 }; @@ -70,7 +70,7 @@ class Fullscreen { // Fullscreen toggle on double click utils.on(this.player.elements.container, 'dblclick', event => { // Ignore double click in controls - if (this.player.elements.controls.contains(event.target)) { + if (utils.is.element(this.player.elements.controls) && this.player.elements.controls.contains(event.target)) { return; } @@ -113,7 +113,7 @@ class Fullscreen { return value; } - static get name() { + static get property() { return this.prefix === 'moz' ? 'FullScreen' : 'Fullscreen'; } @@ -138,7 +138,7 @@ class Fullscreen { return utils.hasClass(this.target, this.player.config.classNames.fullscreen.fallback); } - const element = !this.prefix ? document.fullscreenElement : document[`${this.prefix}${this.name}Element`]; + const element = !this.prefix ? document.fullscreenElement : document[`${this.prefix}${this.property}Element`]; return element === this.target; } @@ -176,7 +176,7 @@ class Fullscreen { } else if (!this.prefix) { this.target.requestFullscreen(); } else if (!utils.is.empty(this.prefix)) { - this.target[`${this.prefix}Request${this.name}`](); + this.target[`${this.prefix}Request${this.property}`](); } } @@ -196,7 +196,7 @@ class Fullscreen { (document.cancelFullScreen || document.exitFullscreen).call(document); } else if (!utils.is.empty(this.prefix)) { const action = this.prefix === 'moz' ? 'Cancel' : 'Exit'; - document[`${this.prefix}${action}${this.name}`](); + document[`${this.prefix}${action}${this.property}`](); } } |