From c7f78caec9ea01daf1af7c4e1cee29a456a1657f Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 13 Aug 2012 18:41:10 +0200 Subject: [PATCH] Check left mouse button is pressed in interactions --- src/ol/interaction/altdragrotate.js | 3 ++- src/ol/interaction/dblclickzoom.js | 4 +++- src/ol/interaction/shiftdragzoom.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ol/interaction/altdragrotate.js b/src/ol/interaction/altdragrotate.js index 03cbbf6d71..5c42c4d434 100644 --- a/src/ol/interaction/altdragrotate.js +++ b/src/ol/interaction/altdragrotate.js @@ -44,7 +44,8 @@ ol.interaction.AltDragRotate.prototype.handleDragStart = function(mapBrowserEvent) { var browserEvent = mapBrowserEvent.browserEvent; var map = mapBrowserEvent.map; - if (map.canRotate() && browserEvent.altKey) { + if (browserEvent.isMouseActionButton() && browserEvent.altKey && + map.canRotate()) { var size = map.getSize(); var theta = Math.atan2( size.height / 2 - browserEvent.offsetY, diff --git a/src/ol/interaction/dblclickzoom.js b/src/ol/interaction/dblclickzoom.js index 2a223c81ac..89bad5955d 100644 --- a/src/ol/interaction/dblclickzoom.js +++ b/src/ol/interaction/dblclickzoom.js @@ -23,7 +23,9 @@ goog.inherits(ol.interaction.DblClickZoom, ol.Interaction); */ ol.interaction.DblClickZoom.prototype.handleMapBrowserEvent = function(mapBrowserEvent) { - if (mapBrowserEvent.type == goog.events.EventType.DBLCLICK) { + var browserEvent = mapBrowserEvent.browserEvent; + if (browserEvent.type == goog.events.EventType.DBLCLICK && + browserEvent.isMouseActionButton()) { var map = mapBrowserEvent.map; var resolution = map.getResolution(); var delta = mapBrowserEvent.browserEvent.shiftKey ? -1 : 1; diff --git a/src/ol/interaction/shiftdragzoom.js b/src/ol/interaction/shiftdragzoom.js index a10e887d17..ce70e4d0c7 100644 --- a/src/ol/interaction/shiftdragzoom.js +++ b/src/ol/interaction/shiftdragzoom.js @@ -55,7 +55,7 @@ ol.interaction.ShiftDragZoom.prototype.handleDragEnd = ol.interaction.ShiftDragZoom.prototype.handleDragStart = function(mapBrowserEvent) { var browserEvent = mapBrowserEvent.browserEvent; - if (browserEvent.shiftKey) { + if (browserEvent.isMouseActionButton() && browserEvent.shiftKey) { browserEvent.preventDefault(); return true; } else {