Merge branch 'master' into master

This commit is contained in:
A-Circle Zhang 2018-08-20 11:37:44 +08:00 committed by GitHub
commit eadc721cd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions

View File

@ -23,18 +23,19 @@ class FullScreen {
}
};
const docfullscreenchange = () => {
let fullEle = document.fullscreenElement || document.mozFullScreenElement || document.msFullscreenElement;
if(fullEle && fullEle !== this.player.container){
const fullEle = document.fullscreenElement || document.mozFullScreenElement || document.msFullscreenElement;
if (fullEle && fullEle !== this.player.container) {
return;
}
if(fullEle){
this.player.resize();
if (fullEle) {
this.player.events.trigger('fullscreen');
} else {
utils.setScrollPosition(this.lastScrollPosition);
this.player.events.trigger('fullscreen_cancel');
}
}
if(/Firefox/.test(navigator.userAgent)){
if (/Firefox/.test(navigator.userAgent)) {
document.addEventListener('mozfullscreenchange', docfullscreenchange);
document.addEventListener('fullscreenchange', docfullscreenchange);
} else {
@ -112,7 +113,7 @@ class FullScreen {
else if (document.msCancelFullScreen) {
document.msCancelFullScreen();
}
else if (document.msExitFullscreen){
else if (document.msExitFullscreen) {
document.msExitFullscreen();
}
break;