зеркало из https://github.com/mozilla/gecko-dev.git
Back out bb1c5961b1e1 (bug 1273468) for failures in test_videocontrols.html
CLOSED TREE
This commit is contained in:
Родитель
5938137a2b
Коммит
7353927cf9
|
@ -29,10 +29,10 @@ document.addEventListener("keypress", ev => {
|
|||
ev.preventDefault();
|
||||
ev.stopPropagation();
|
||||
|
||||
if (!document.mozFullScreenElement) {
|
||||
videoElement.mozRequestFullScreen();
|
||||
if (!document.fullscreenElement) {
|
||||
videoElement.requestFullscreen();
|
||||
} else {
|
||||
document.mozCancelFullScreen();
|
||||
document.exitFullscreen();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -1007,7 +1007,7 @@
|
|||
} else {
|
||||
element.setAttribute("fadeout", true);
|
||||
if (element.classList.contains("controlBar") && !this.hasError() &&
|
||||
document.mozFullScreenElement == this.video)
|
||||
document.fullscreenElement == this.video)
|
||||
this.controlsSpacer.setAttribute("hideCursor", true);
|
||||
|
||||
}
|
||||
|
@ -1065,17 +1065,17 @@
|
|||
},
|
||||
|
||||
isVideoInFullScreen : function () {
|
||||
return document.mozFullScreenElement == this.video;
|
||||
return document.fullscreenElement == this.video;
|
||||
},
|
||||
|
||||
toggleFullscreen : function () {
|
||||
this.isVideoInFullScreen() ?
|
||||
document.mozCancelFullScreen() :
|
||||
this.video.mozRequestFullScreen();
|
||||
document.exitFullscreen() :
|
||||
this.video.requestFullscreen();
|
||||
},
|
||||
|
||||
setFullscreenButtonState : function () {
|
||||
if (this.isAudioOnly || !document.mozFullScreenEnabled) {
|
||||
if (this.isAudioOnly || !document.fullscreenEnabled) {
|
||||
this.controlBar.setAttribute("fullscreen-unavailable", true);
|
||||
this.adjustControlSize();
|
||||
return;
|
||||
|
@ -1525,7 +1525,7 @@
|
|||
|
||||
addListener(this.videocontrols, "resizevideocontrols", this.adjustControlSize);
|
||||
addListener(this.videocontrols, "transitionend", this.onTransitionEnd);
|
||||
addListener(this.video.ownerDocument, "mozfullscreenchange", this.onFullscreenChange);
|
||||
addListener(this.video.ownerDocument, "fullscreenchange", this.onFullscreenChange);
|
||||
addListener(this.video, "keypress", this.keyHandler);
|
||||
|
||||
addListener(this.videocontrols, "dragstart", function(event) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче