From cc87a092fd59ddf65aa736db0fff475b321c1b46 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 31 Aug 2016 11:06:54 +0200 Subject: [PATCH] Give ol.pointer.EventType its own file --- src/ol/control/zoomslider.js | 1 + src/ol/mapbrowserevent.js | 1 + src/ol/pointer/eventtype.js | 17 +++++++++++++++++ src/ol/pointer/pointereventhandler.js | 17 +---------------- 4 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 src/ol/pointer/eventtype.js diff --git a/src/ol/control/zoomslider.js b/src/ol/control/zoomslider.js index d5d449764e..eccb41adf1 100644 --- a/src/ol/control/zoomslider.js +++ b/src/ol/control/zoomslider.js @@ -12,6 +12,7 @@ goog.require('ol.events'); goog.require('ol.events.Event'); goog.require('ol.events.EventType'); goog.require('ol.math'); +goog.require('ol.pointer.EventType'); goog.require('ol.pointer.PointerEventHandler'); diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index c29813b6e5..3551386749 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -8,6 +8,7 @@ goog.require('ol.MapEvent'); goog.require('ol.events'); goog.require('ol.events.EventTarget'); goog.require('ol.events.EventType'); +goog.require('ol.pointer.EventType'); goog.require('ol.pointer.PointerEventHandler'); diff --git a/src/ol/pointer/eventtype.js b/src/ol/pointer/eventtype.js new file mode 100644 index 0000000000..1c25d1d27b --- /dev/null +++ b/src/ol/pointer/eventtype.js @@ -0,0 +1,17 @@ +goog.provide('ol.pointer.EventType'); + + +/** + * Constants for event names. + * @enum {string} + */ +ol.pointer.EventType = { + POINTERMOVE: 'pointermove', + POINTERDOWN: 'pointerdown', + POINTERUP: 'pointerup', + POINTEROVER: 'pointerover', + POINTEROUT: 'pointerout', + POINTERENTER: 'pointerenter', + POINTERLEAVE: 'pointerleave', + POINTERCANCEL: 'pointercancel' +}; diff --git a/src/ol/pointer/pointereventhandler.js b/src/ol/pointer/pointereventhandler.js index c3f0199207..8a6d6b5031 100644 --- a/src/ol/pointer/pointereventhandler.js +++ b/src/ol/pointer/pointereventhandler.js @@ -35,6 +35,7 @@ goog.require('ol.events'); goog.require('ol.events.EventTarget'); goog.require('ol.has'); +goog.require('ol.pointer.EventType'); goog.require('ol.pointer.MouseSource'); goog.require('ol.pointer.MsSource'); goog.require('ol.pointer.NativeSource'); @@ -402,22 +403,6 @@ ol.pointer.PointerEventHandler.prototype.disposeInternal = function() { }; -/** - * Constants for event names. - * @enum {string} - */ -ol.pointer.EventType = { - POINTERMOVE: 'pointermove', - POINTERDOWN: 'pointerdown', - POINTERUP: 'pointerup', - POINTEROVER: 'pointerover', - POINTEROUT: 'pointerout', - POINTERENTER: 'pointerenter', - POINTERLEAVE: 'pointerleave', - POINTERCANCEL: 'pointercancel' -}; - - /** * Properties to copy when cloning an event, with default values. * @type {Array.}