From 6b395cafb503dcd8800beb57be5bd56f1b44fa9c Mon Sep 17 00:00:00 2001 From: ahocevar Date: Fri, 28 Sep 2012 16:46:21 +0200 Subject: [PATCH] Stop click event, as previously promised This should have gone in with 3910318f1bc9b586228922ecfb98955a22483b34. --- src/ol/control/zoom.js | 4 ++-- src/ol/map.js | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ol/control/zoom.js b/src/ol/control/zoom.js index 583532e567..efc5be3c70 100644 --- a/src/ol/control/zoom.js +++ b/src/ol/control/zoom.js @@ -65,7 +65,7 @@ goog.inherits(ol.control.Zoom, ol.control.Control); * @private */ ol.control.Zoom.prototype.handleIn_ = function(browserEvent) { - browserEvent.stopPropagation(); + // prevent #zoomIn anchor from getting appended to the url browserEvent.preventDefault(); this.getMap().zoom(this.delta_); }; @@ -76,7 +76,7 @@ ol.control.Zoom.prototype.handleIn_ = function(browserEvent) { * @private */ ol.control.Zoom.prototype.handleOut_ = function(browserEvent) { - browserEvent.stopPropagation(); + // prevent #zoomOut anchor from getting appended to the url browserEvent.preventDefault(); this.getMap().zoom(-this.delta_); }; diff --git a/src/ol/map.js b/src/ol/map.js index 18a15bad87..876e29a147 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -151,10 +151,11 @@ ol.Map = function(container, mapOptionsLiteral) { */ this.overlayContainer_ = goog.dom.createDom(goog.dom.TagName.DIV, 'ol-overlaycontainer'); - goog.events.listen(this.overlayContainer_, - ol.BrowserFeature.HAS_TOUCH ? - goog.events.EventType.TOUCHSTART : goog.events.EventType.MOUSEDOWN, - goog.events.Event.stopPropagation); + goog.events.listen(this.overlayContainer_, [ + goog.events.EventType.CLICK, + ol.BrowserFeature.HAS_TOUCH ? + goog.events.EventType.TOUCHSTART : goog.events.EventType.MOUSEDOWN + ], goog.events.Event.stopPropagation); goog.dom.appendChild(this.viewport_, this.overlayContainer_); var mapBrowserEventHandler = new ol.MapBrowserEventHandler(this);