ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10993 from ahocevar/no-custom-types

Browse Source 
Do not rely on custom type overrides
This commit is contained in:
Andreas Hocevar
2020-05-02 18:45:49 +02:00
committed by GitHub
parent 309c2a1090 2d38390e58
commit 26feba1bb5
2 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/control/FullScreen.js
+14 -14
View File
@@ -245,8 +245,8 @@ class FullScreen extends Control {
function isFullScreenSupported() { function isFullScreenSupported() {
const body = document.body; const body = document.body;
return !!( return !!(
body.webkitRequestFullscreen || body['webkitRequestFullscreen'] ||
(body.msRequestFullscreen && document.msFullscreenEnabled) || (body['msRequestFullscreen'] && document['msFullscreenEnabled']) ||
(body.requestFullscreen && document.fullscreenEnabled) (body.requestFullscreen && document.fullscreenEnabled)
); );
} }
@@ -256,8 +256,8 @@ function isFullScreenSupported() {
*/ */
function isFullScreen() { function isFullScreen() {
return !!( return !!(
document.webkitIsFullScreen || document['webkitIsFullScreen'] ||
document.msFullscreenElement || document['msFullscreenElement'] ||
document.fullscreenElement document.fullscreenElement
); );
} }
@@ -269,10 +269,10 @@ function isFullScreen() {
function requestFullScreen(element) { function requestFullScreen(element) {
if (element.requestFullscreen) { if (element.requestFullscreen) {
element.requestFullscreen(); element.requestFullscreen();
} else if (element.msRequestFullscreen) { } else if (element['msRequestFullscreen']) {
element.msRequestFullscreen(); element['msRequestFullscreen']();
} else if (element.webkitRequestFullscreen) { } else if (element['webkitRequestFullscreen']) {
element.webkitRequestFullscreen(); element['webkitRequestFullscreen']();
} }
} }
@@ -281,8 +281,8 @@ function requestFullScreen(element) {
* @param {HTMLElement} element Element to request fullscreen * @param {HTMLElement} element Element to request fullscreen
*/ */
function requestFullScreenWithKeys(element) { function requestFullScreenWithKeys(element) {
if (element.webkitRequestFullscreen) { if (element['webkitRequestFullscreen']) {
element.webkitRequestFullscreen(); element['webkitRequestFullscreen']();
} else { } else {
requestFullScreen(element); requestFullScreen(element);
} }
@@ -294,10 +294,10 @@ function requestFullScreenWithKeys(element) {
function exitFullScreen() { function exitFullScreen() {
if (document.exitFullscreen) { if (document.exitFullscreen) {
document.exitFullscreen(); document.exitFullscreen();
} else if (document.msExitFullscreen) { } else if (document['msExitFullscreen']) {
document.msExitFullscreen(); document['msExitFullscreen']();
} else if (document.webkitExitFullscreen) { } else if (document['webkitExitFullscreen']) {
document.webkitExitFullscreen(); document['webkitExitFullscreen']();
} }
} }
types/dom.d.ts
Vendored
-23
View File
@@ -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<void>;
webkitRequestFullscreen(allowKeyboardInput?: number): Promise<void>;
}