diff --git a/src/ol/control/FullScreen.js b/src/ol/control/FullScreen.js index 792372e84b..a6aeb9a8c3 100644 --- a/src/ol/control/FullScreen.js +++ b/src/ol/control/FullScreen.js @@ -245,8 +245,8 @@ class FullScreen extends Control { function isFullScreenSupported() { const body = document.body; return !!( - body.webkitRequestFullscreen || - (body.msRequestFullscreen && document.msFullscreenEnabled) || + body['webkitRequestFullscreen'] || + (body['msRequestFullscreen'] && document['msFullscreenEnabled']) || (body.requestFullscreen && document.fullscreenEnabled) ); } @@ -256,8 +256,8 @@ function isFullScreenSupported() { */ function isFullScreen() { return !!( - document.webkitIsFullScreen || - document.msFullscreenElement || + document['webkitIsFullScreen'] || + document['msFullscreenElement'] || document.fullscreenElement ); } @@ -269,10 +269,10 @@ function isFullScreen() { function requestFullScreen(element) { if (element.requestFullscreen) { element.requestFullscreen(); - } else if (element.msRequestFullscreen) { - element.msRequestFullscreen(); - } else if (element.webkitRequestFullscreen) { - element.webkitRequestFullscreen(); + } else if (element['msRequestFullscreen']) { + element['msRequestFullscreen'](); + } else if (element['webkitRequestFullscreen']) { + element['webkitRequestFullscreen'](); } } @@ -281,8 +281,8 @@ function requestFullScreen(element) { * @param {HTMLElement} element Element to request fullscreen */ function requestFullScreenWithKeys(element) { - if (element.webkitRequestFullscreen) { - element.webkitRequestFullscreen(); + if (element['webkitRequestFullscreen']) { + element['webkitRequestFullscreen'](); } else { requestFullScreen(element); } @@ -294,10 +294,10 @@ function requestFullScreenWithKeys(element) { function exitFullScreen() { if (document.exitFullscreen) { document.exitFullscreen(); - } else if (document.msExitFullscreen) { - document.msExitFullscreen(); - } else if (document.webkitExitFullscreen) { - document.webkitExitFullscreen(); + } else if (document['msExitFullscreen']) { + document['msExitFullscreen'](); + } else if (document['webkitExitFullscreen']) { + document['webkitExitFullscreen'](); } } diff --git a/types/dom.d.ts b/types/dom.d.ts deleted file mode 100644 index 6d938c9e92..0000000000 --- a/types/dom.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Type declarations extending TypeScript's lib/lib.dom.d.ts. - * https://github.com/Microsoft/TypeScript/blob/master/lib/lib.dom.d.ts - */ - -interface Document { - readonly webkitIsFullScreen: boolean; - - readonly fullscreenElement: Element; - readonly msFullscreenElement: Element; - readonly webkitFullscreenElement: Element; - - readonly msFullscreenEnabled: boolean; - readonly webkitFullscreenEnabled: boolean; - - msExitFullscreen(): void; - webkitExitFullscreen(): void; -} - -interface Element { - msRequestFullscreen(): Promise; - webkitRequestFullscreen(allowKeyboardInput?: number): Promise; -}