From 391dfc5025998b557bb909c810cf4d014616146f Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 15 Feb 2019 14:29:13 +0100 Subject: [PATCH 1/2] Remove vendor prefix for the 'transform' CSS property Browser support: https://caniuse.com/#feat=transforms2d --- src/ol/control/Rotate.js | 2 -- types/dom.d.ts | 4 ---- 2 files changed, 6 deletions(-) diff --git a/src/ol/control/Rotate.js b/src/ol/control/Rotate.js index fc20aed4d8..c4abc550c1 100644 --- a/src/ol/control/Rotate.js +++ b/src/ol/control/Rotate.js @@ -169,8 +169,6 @@ export function render(mapEvent) { this.element.classList.remove(CLASS_HIDDEN); } } - this.label_.style.msTransform = transform; - this.label_.style.webkitTransform = transform; this.label_.style.transform = transform; } this.rotation_ = rotation; diff --git a/types/dom.d.ts b/types/dom.d.ts index 8ae4e45c60..ab406a05b8 100644 --- a/types/dom.d.ts +++ b/types/dom.d.ts @@ -27,7 +27,3 @@ interface Element { msRequestFullscreen(): Promise; webkitRequestFullscreen(allowKeyboardInput?: number): Promise; } - -interface CSSStyleDeclaration { - msTransform: string | null; -} From e9ecea3bb75c83971923df221cdabeedaad07520 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 15 Feb 2019 14:37:48 +0100 Subject: [PATCH 2/2] Remove 'moz' prefix for the Full Screen API Browser support: https://caniuse.com/#feat=fullscreen --- examples/full-screen-drag-rotate-and-zoom.css | 3 --- examples/full-screen-source.css | 3 --- examples/full-screen.css | 3 --- src/ol/control/FullScreen.js | 14 +++----------- types/dom.d.ts | 6 ------ 5 files changed, 3 insertions(+), 26 deletions(-) diff --git a/examples/full-screen-drag-rotate-and-zoom.css b/examples/full-screen-drag-rotate-and-zoom.css index 82e52e42ec..1a4cbf846e 100644 --- a/examples/full-screen-drag-rotate-and-zoom.css +++ b/examples/full-screen-drag-rotate-and-zoom.css @@ -1,6 +1,3 @@ -.map:-moz-full-screen { - height: 100%; -} .map:-webkit-full-screen { height: 100%; } diff --git a/examples/full-screen-source.css b/examples/full-screen-source.css index 99b7c25154..4032bd528b 100644 --- a/examples/full-screen-source.css +++ b/examples/full-screen-source.css @@ -1,6 +1,3 @@ -.fullscreen:-moz-full-screen { - height: 100%; -} .fullscreen:-webkit-full-screen { height: 100%; } diff --git a/examples/full-screen.css b/examples/full-screen.css index 8b28c0651c..494567cfe4 100644 --- a/examples/full-screen.css +++ b/examples/full-screen.css @@ -1,6 +1,3 @@ -.map:-moz-full-screen { - height: 100%; -} .map:-webkit-full-screen { height: 100%; } diff --git a/src/ol/control/FullScreen.js b/src/ol/control/FullScreen.js index 76f7ba2260..af2267a7dc 100644 --- a/src/ol/control/FullScreen.js +++ b/src/ol/control/FullScreen.js @@ -7,7 +7,7 @@ import {replaceNode} from '../dom.js'; import {listen} from '../events.js'; import EventType from '../events/EventType.js'; -const events = ['fullscreenchange', 'webkitfullscreenchange', 'mozfullscreenchange', 'MSFullscreenChange']; +const events = ['fullscreenchange', 'webkitfullscreenchange', 'MSFullscreenChange']; /** * @typedef {Object} Options @@ -209,7 +209,6 @@ function isFullScreenSupported() { const body = document.body; return !!( body.webkitRequestFullscreen || - (body.mozRequestFullScreen && document.mozFullScreenEnabled) || (body.msRequestFullscreen && document.msFullscreenEnabled) || (body.requestFullscreen && document.fullscreenEnabled) ); @@ -220,8 +219,7 @@ function isFullScreenSupported() { */ function isFullScreen() { return !!( - document.webkitIsFullScreen || document.mozFullScreen || - document.msFullscreenElement || document.fullscreenElement + document.webkitIsFullScreen || document.msFullscreenElement || document.fullscreenElement ); } @@ -234,8 +232,6 @@ function requestFullScreen(element) { element.requestFullscreen(); } else if (element.msRequestFullscreen) { element.msRequestFullscreen(); - } else if (element.mozRequestFullScreen) { - element.mozRequestFullScreen(); } else if (element.webkitRequestFullscreen) { element.webkitRequestFullscreen(); } @@ -246,9 +242,7 @@ function requestFullScreen(element) { * @param {HTMLElement} element Element to request fullscreen */ function requestFullScreenWithKeys(element) { - if (element.mozRequestFullScreenWithKeys) { - element.mozRequestFullScreenWithKeys(); - } else if (element.webkitRequestFullscreen) { + if (element.webkitRequestFullscreen) { element.webkitRequestFullscreen(); } else { requestFullScreen(element); @@ -263,8 +257,6 @@ function exitFullScreen() { document.exitFullscreen(); } else if (document.msExitFullscreen) { document.msExitFullscreen(); - } else if (document.mozCancelFullScreen) { - document.mozCancelFullScreen(); } else if (document.webkitExitFullscreen) { document.webkitExitFullscreen(); } diff --git a/types/dom.d.ts b/types/dom.d.ts index ab406a05b8..6d938c9e92 100644 --- a/types/dom.d.ts +++ b/types/dom.d.ts @@ -4,26 +4,20 @@ */ interface Document { - readonly mozFullScreen: boolean; readonly webkitIsFullScreen: boolean; readonly fullscreenElement: Element; - readonly mozFullScreenElement: Element; readonly msFullscreenElement: Element; readonly webkitFullscreenElement: Element; - readonly mozFullScreenEnabled: boolean; readonly msFullscreenEnabled: boolean; readonly webkitFullscreenEnabled: boolean; - mozCancelFullScreen(): void; msExitFullscreen(): void; webkitExitFullscreen(): void; } interface Element { - mozRequestFullScreen(): Promise; - mozRequestFullScreenWithKeys(): Promise; msRequestFullscreen(): Promise; webkitRequestFullscreen(allowKeyboardInput?: number): Promise; }