diff --git a/src/ol/interaction/doubleclickzoominteraction.js b/src/ol/interaction/doubleclickzoominteraction.js index dc439f8b33..1b106052b1 100644 --- a/src/ol/interaction/doubleclickzoominteraction.js +++ b/src/ol/interaction/doubleclickzoominteraction.js @@ -46,8 +46,7 @@ ol.interaction.DoubleClickZoom.prototype.handleMapBrowserEvent = function(mapBrowserEvent) { var stopEvent = false; var browserEvent = mapBrowserEvent.browserEvent; - if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DBLCLICK && - mapBrowserEvent.isMouseActionButton()) { + if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DBLCLICK) { var map = mapBrowserEvent.map; var anchor = mapBrowserEvent.getCoordinate(); var delta = browserEvent.shiftKey ? -this.delta_ : this.delta_; diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index 5902e6b4b0..6cecd64c92 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -8,7 +8,6 @@ goog.require('goog.events'); goog.require('goog.events.BrowserEvent'); goog.require('goog.events.EventTarget'); goog.require('goog.events.EventType'); -goog.require('ol.BrowserFeature'); goog.require('ol.Coordinate'); goog.require('ol.FrameState'); goog.require('ol.MapEvent'); @@ -76,16 +75,6 @@ ol.MapBrowserEvent.prototype.getPixel = function() { }; -/** - * @return {boolean} Do we have a left click? - */ -ol.MapBrowserEvent.prototype.isMouseActionButton = function() { - // always assume a left-click on touch devices - return ol.BrowserFeature.HAS_TOUCH || - this.browserEvent.isMouseActionButton(); -}; - - /** * Prevents the default browser action. * @see https://developer.mozilla.org/en-US/docs/Web/API/event.preventDefault @@ -226,7 +215,7 @@ ol.MapBrowserEventHandler.prototype.handleMouseUp_ = function(browserEvent) { ol.MapBrowserEvent.EventType.DRAGEND, this.map_, browserEvent); this.dispatchEvent(newEvent); this.down_ = null; - } else { + } else if (browserEvent.isMouseActionButton()) { this.emulateClick_(browserEvent); } }