diff --git a/src/ol/pointer/mousesource.js b/src/ol/pointer/mousesource.js index 97dee9c3ca..f9bc5b5864 100644 --- a/src/ol/pointer/mousesource.js +++ b/src/ol/pointer/mousesource.js @@ -30,6 +30,7 @@ goog.provide('ol.pointer.MouseSource'); +goog.require('goog.object'); goog.require('ol.pointer.EventSource'); @@ -48,18 +49,6 @@ ol.pointer.MouseSource = function(dispatcher) { */ this.pointerMap = dispatcher.pointerMap; - /** - * @const - * @type {Array.} - */ - this.events = [ - 'mousedown', - 'mousemove', - 'mouseup', - 'mouseover', - 'mouseout' - ]; - /** * @const * @type {Object.} @@ -106,7 +95,7 @@ ol.pointer.MouseSource.DEDUP_DIST = 25; /** @inheritDoc */ ol.pointer.MouseSource.prototype.getEvents = function() { - return this.events; + return goog.object.getKeys(this.mapping); }; diff --git a/src/ol/pointer/mssource.js b/src/ol/pointer/mssource.js index 69e3e3250b..8486a8d61d 100644 --- a/src/ol/pointer/mssource.js +++ b/src/ol/pointer/mssource.js @@ -30,6 +30,7 @@ goog.provide('ol.pointer.MsSource'); +goog.require('goog.object'); goog.require('ol.pointer.EventSource'); @@ -54,21 +55,6 @@ ol.pointer.MsSource = function(dispatcher) { */ this.HAS_BITMAP_TYPE = this.hasBitmapType(); - /** - * @const - * @type {Array.} - */ - this.events = [ - 'MSPointerDown', - 'MSPointerMove', - 'MSPointerUp', - 'MSPointerOut', - 'MSPointerOver', - 'MSPointerCancel', - 'MSGotPointerCapture', - 'MSLostPointerCapture' - ]; - /** * @const * @type {Object.} @@ -101,7 +87,7 @@ goog.inherits(ol.pointer.MsSource, ol.pointer.EventSource); /** @inheritDoc */ ol.pointer.MsSource.prototype.getEvents = function() { - return this.events; + return goog.object.getKeys(this.mapping); }; diff --git a/src/ol/pointer/nativesource.js b/src/ol/pointer/nativesource.js index f43003903c..470bc393d6 100644 --- a/src/ol/pointer/nativesource.js +++ b/src/ol/pointer/nativesource.js @@ -30,6 +30,7 @@ goog.provide('ol.pointer.NativeSource'); +goog.require('goog.object'); goog.require('ol.pointer.EventSource'); @@ -48,21 +49,6 @@ ol.pointer.NativeSource = function(dispatcher) { */ this.pointerMap = dispatcher.pointerMap; - /** - * @const - * @type {Array.} - */ - this.events = [ - 'pointerdown', - 'pointermove', - 'pointerup', - 'pointerout', - 'pointerover', - 'pointercancel', - 'gotpointercapture', - 'lostpointercapture' - ]; - /** * @const * @type {Object.} @@ -83,7 +69,7 @@ goog.inherits(ol.pointer.NativeSource, ol.pointer.EventSource); /** @inheritDoc */ ol.pointer.NativeSource.prototype.getEvents = function() { - return this.events; + return goog.object.getKeys(this.mapping); }; diff --git a/src/ol/pointer/touchsource.js b/src/ol/pointer/touchsource.js index 0fc1434a46..e4113f1c99 100644 --- a/src/ol/pointer/touchsource.js +++ b/src/ol/pointer/touchsource.js @@ -32,6 +32,7 @@ goog.provide('ol.pointer.TouchSource'); goog.require('goog.array'); goog.require('goog.math.Coordinate'); +goog.require('goog.object'); goog.require('ol.pointer.EventSource'); @@ -95,17 +96,6 @@ ol.pointer.TouchSource = function(dispatcher, mouseSource) { */ this.resetId_ = null; - /** - * @const - * @type {Array.} - */ - this.events = [ - 'touchstart', - 'touchmove', - 'touchend', - 'touchcancel' - ]; - /** * @const * @type {Object.} @@ -122,7 +112,7 @@ goog.inherits(ol.pointer.TouchSource, ol.pointer.EventSource); /** @inheritDoc */ ol.pointer.TouchSource.prototype.getEvents = function() { - return this.events; + return goog.object.getKeys(this.mapping); };