From 569deddd0672646b6d40d9625ef2514484f25cc9 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 19 Nov 2019 23:27:27 +0100 Subject: [PATCH 1/2] Use elm-pep instead of PEP as pointer events polyfill --- package.json | 2 +- src/ol/MapBrowserEventHandler.js | 2 +- src/ol/control/MousePosition.js | 3 ++- src/ol/control/ZoomSlider.js | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index cadc8fac1f..03ca34a1be 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "url": "https://github.com/openlayers/openlayers/issues" }, "dependencies": { - "@openlayers/pepjs": "^0.5.3", + "elm-pep": "^1.0.2", "pbf": "3.2.1", "pixelworks": "1.1.0", "rbush": "^3.0.1" diff --git a/src/ol/MapBrowserEventHandler.js b/src/ol/MapBrowserEventHandler.js index 0a6425974c..e56e178488 100644 --- a/src/ol/MapBrowserEventHandler.js +++ b/src/ol/MapBrowserEventHandler.js @@ -2,7 +2,7 @@ * @module ol/MapBrowserEventHandler */ -import '@openlayers/pepjs'; +import 'elm-pep'; import {DEVICE_PIXEL_RATIO} from './has.js'; import MapBrowserEventType from './MapBrowserEventType.js'; import MapBrowserPointerEvent from './MapBrowserPointerEvent.js'; diff --git a/src/ol/control/MousePosition.js b/src/ol/control/MousePosition.js index cb96bf3514..e4f9aae624 100644 --- a/src/ol/control/MousePosition.js +++ b/src/ol/control/MousePosition.js @@ -1,12 +1,13 @@ /** * @module ol/control/MousePosition */ + +import 'elm-pep'; import {listen} from '../events.js'; import EventType from '../pointer/EventType.js'; import {getChangeEventType} from '../Object.js'; import Control from './Control.js'; import {getTransformFromProjections, identityTransform, get as getProjection, getUserProjection} from '../proj.js'; -import '@openlayers/pepjs'; /** diff --git a/src/ol/control/ZoomSlider.js b/src/ol/control/ZoomSlider.js index 07397ffc77..a87da521c0 100644 --- a/src/ol/control/ZoomSlider.js +++ b/src/ol/control/ZoomSlider.js @@ -1,6 +1,8 @@ /** * @module ol/control/ZoomSlider */ + +import 'elm-pep'; import Control from './Control.js'; import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js'; import {easeOut} from '../easing.js'; @@ -9,7 +11,6 @@ import {stopPropagation} from '../events/Event.js'; import EventType from '../events/EventType.js'; import {clamp} from '../math.js'; import PointerEventType from '../pointer/EventType.js'; -import '@openlayers/pepjs'; /** From ae1e8b662d9106634b6a9226ab568218efb9e4f0 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 19 Nov 2019 23:32:57 +0100 Subject: [PATCH 2/2] Update package-lock.json --- package-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 14e3d7d762..0a6a99bdac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1333,11 +1333,6 @@ "minimatch": "^3.0.4" } }, - "@openlayers/pepjs": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@openlayers/pepjs/-/pepjs-0.5.3.tgz", - "integrity": "sha512-Bgvi5c14BS0FJWyYWWFstNEnXsB30nK8Jt8hkAAdqr7E0gDdBBWVDglF3Ub19wTxvgJ/CVHyTY6VuCtnyRzglg==" - }, "@sinonjs/commons": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.4.0.tgz", @@ -3701,6 +3696,11 @@ "minimalistic-crypto-utils": "^1.0.0" } }, + "elm-pep": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/elm-pep/-/elm-pep-1.0.2.tgz", + "integrity": "sha512-+dIbw0659EIredBSGO7/vuQ/g3lJgy98ce7rkN9LvSSsyIPjTxfuBeAsxHDJGXuCrHXwji/Z4XRLghiAz1s4Uw==" + }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",