From ef3f60e63622ec3472a6d0a1f11a58a765146d13 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 18 Dec 2017 17:19:45 +0100 Subject: [PATCH] Rename _ol_pointer_EventType_ to PointerEventType --- src/ol/MapBrowserEventHandler.js | 6 +++--- src/ol/control/ZoomSlider.js | 8 ++++---- src/ol/pointer/PointerEventHandler.js | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/ol/MapBrowserEventHandler.js b/src/ol/MapBrowserEventHandler.js index 9d31c8847a..2fbb76d756 100644 --- a/src/ol/MapBrowserEventHandler.js +++ b/src/ol/MapBrowserEventHandler.js @@ -7,7 +7,7 @@ import MapBrowserEventType from './MapBrowserEventType.js'; import MapBrowserPointerEvent from './MapBrowserPointerEvent.js'; import _ol_events_ from './events.js'; import EventTarget from './events/EventTarget.js'; -import _ol_pointer_EventType_ from './pointer/EventType.js'; +import PointerEventType from './pointer/EventType.js'; import _ol_pointer_PointerEventHandler_ from './pointer/PointerEventHandler.js'; /** @@ -97,7 +97,7 @@ var MapBrowserEventHandler = function(map, moveTolerance) { * @private */ this.pointerdownListenerKey_ = _ol_events_.listen(this.pointerEventHandler_, - _ol_pointer_EventType_.POINTERDOWN, + PointerEventType.POINTERDOWN, this.handlePointerDown_, this); /** @@ -105,7 +105,7 @@ var MapBrowserEventHandler = function(map, moveTolerance) { * @private */ this.relayedListenerKey_ = _ol_events_.listen(this.pointerEventHandler_, - _ol_pointer_EventType_.POINTERMOVE, + PointerEventType.POINTERMOVE, this.relayEvent_, this); }; diff --git a/src/ol/control/ZoomSlider.js b/src/ol/control/ZoomSlider.js index 6c7f9da741..bcf77eef27 100644 --- a/src/ol/control/ZoomSlider.js +++ b/src/ol/control/ZoomSlider.js @@ -12,7 +12,7 @@ import _ol_events_ from '../events.js'; import Event from '../events/Event.js'; import EventType from '../events/EventType.js'; import _ol_math_ from '../math.js'; -import _ol_pointer_EventType_ from '../pointer/EventType.js'; +import PointerEventType from '../pointer/EventType.js'; import _ol_pointer_PointerEventHandler_ from '../pointer/PointerEventHandler.js'; /** @@ -113,11 +113,11 @@ var ZoomSlider = function(opt_options) { */ this.dragger_ = new _ol_pointer_PointerEventHandler_(containerElement); - _ol_events_.listen(this.dragger_, _ol_pointer_EventType_.POINTERDOWN, + _ol_events_.listen(this.dragger_, PointerEventType.POINTERDOWN, this.handleDraggerStart_, this); - _ol_events_.listen(this.dragger_, _ol_pointer_EventType_.POINTERMOVE, + _ol_events_.listen(this.dragger_, PointerEventType.POINTERMOVE, this.handleDraggerDrag_, this); - _ol_events_.listen(this.dragger_, _ol_pointer_EventType_.POINTERUP, + _ol_events_.listen(this.dragger_, PointerEventType.POINTERUP, this.handleDraggerEnd_, this); _ol_events_.listen(containerElement, EventType.CLICK, diff --git a/src/ol/pointer/PointerEventHandler.js b/src/ol/pointer/PointerEventHandler.js index a243203afd..0b08664cb0 100644 --- a/src/ol/pointer/PointerEventHandler.js +++ b/src/ol/pointer/PointerEventHandler.js @@ -35,7 +35,7 @@ import {inherits} from '../index.js'; import _ol_events_ from '../events.js'; import EventTarget from '../events/EventTarget.js'; import _ol_has_ from '../has.js'; -import _ol_pointer_EventType_ from '../pointer/EventType.js'; +import PointerEventType from '../pointer/EventType.js'; import _ol_pointer_MouseSource_ from '../pointer/MouseSource.js'; import _ol_pointer_MsSource_ from '../pointer/MsSource.js'; import _ol_pointer_NativeSource_ from '../pointer/NativeSource.js'; @@ -223,7 +223,7 @@ _ol_pointer_PointerEventHandler_.prototype.cloneEvent = function(event, inEvent) * @param {Event} event The event. */ _ol_pointer_PointerEventHandler_.prototype.down = function(data, event) { - this.fireEvent(_ol_pointer_EventType_.POINTERDOWN, data, event); + this.fireEvent(PointerEventType.POINTERDOWN, data, event); }; @@ -233,7 +233,7 @@ _ol_pointer_PointerEventHandler_.prototype.down = function(data, event) { * @param {Event} event The event. */ _ol_pointer_PointerEventHandler_.prototype.move = function(data, event) { - this.fireEvent(_ol_pointer_EventType_.POINTERMOVE, data, event); + this.fireEvent(PointerEventType.POINTERMOVE, data, event); }; @@ -243,7 +243,7 @@ _ol_pointer_PointerEventHandler_.prototype.move = function(data, event) { * @param {Event} event The event. */ _ol_pointer_PointerEventHandler_.prototype.up = function(data, event) { - this.fireEvent(_ol_pointer_EventType_.POINTERUP, data, event); + this.fireEvent(PointerEventType.POINTERUP, data, event); }; @@ -254,7 +254,7 @@ _ol_pointer_PointerEventHandler_.prototype.up = function(data, event) { */ _ol_pointer_PointerEventHandler_.prototype.enter = function(data, event) { data.bubbles = false; - this.fireEvent(_ol_pointer_EventType_.POINTERENTER, data, event); + this.fireEvent(PointerEventType.POINTERENTER, data, event); }; @@ -265,7 +265,7 @@ _ol_pointer_PointerEventHandler_.prototype.enter = function(data, event) { */ _ol_pointer_PointerEventHandler_.prototype.leave = function(data, event) { data.bubbles = false; - this.fireEvent(_ol_pointer_EventType_.POINTERLEAVE, data, event); + this.fireEvent(PointerEventType.POINTERLEAVE, data, event); }; @@ -276,7 +276,7 @@ _ol_pointer_PointerEventHandler_.prototype.leave = function(data, event) { */ _ol_pointer_PointerEventHandler_.prototype.over = function(data, event) { data.bubbles = true; - this.fireEvent(_ol_pointer_EventType_.POINTEROVER, data, event); + this.fireEvent(PointerEventType.POINTEROVER, data, event); }; @@ -287,7 +287,7 @@ _ol_pointer_PointerEventHandler_.prototype.over = function(data, event) { */ _ol_pointer_PointerEventHandler_.prototype.out = function(data, event) { data.bubbles = true; - this.fireEvent(_ol_pointer_EventType_.POINTEROUT, data, event); + this.fireEvent(PointerEventType.POINTEROUT, data, event); }; @@ -297,7 +297,7 @@ _ol_pointer_PointerEventHandler_.prototype.out = function(data, event) { * @param {Event} event The event. */ _ol_pointer_PointerEventHandler_.prototype.cancel = function(data, event) { - this.fireEvent(_ol_pointer_EventType_.POINTERCANCEL, data, event); + this.fireEvent(PointerEventType.POINTERCANCEL, data, event); };