diff --git a/src/ol/control/fullscreencontrol.js b/src/ol/control/fullscreencontrol.js index 569a4c124d..318008929c 100644 --- a/src/ol/control/fullscreencontrol.js +++ b/src/ol/control/fullscreencontrol.js @@ -52,6 +52,8 @@ ol.control.FullScreen = function(opt_options) { this.registerDisposable(buttonHandler); goog.events.listen(buttonHandler, ol.pointer.EventType.POINTERUP, this.handleClick_, false, this); + goog.events.listen(button, goog.events.EventType.CLICK, + this.handleClick_, false, this); goog.events.listen(button, [ goog.events.EventType.MOUSEOUT, @@ -92,7 +94,11 @@ ol.control.FullScreen.prototype.handleClick_ = function(pointerEvent) { if (!googx.dom.fullscreen.isSupported()) { return; } - pointerEvent.browserEvent.preventDefault(); + if (goog.isDef(pointerEvent.browserEvent)) { + pointerEvent.browserEvent.preventDefault(); + } else if (pointerEvent.screenX !== 0 && pointerEvent.screenY !== 0) { + return; + } var map = this.getMap(); if (goog.isNull(map)) { return; diff --git a/src/ol/control/rotatecontrol.js b/src/ol/control/rotatecontrol.js index 8596e6dbb3..80aa7eca93 100644 --- a/src/ol/control/rotatecontrol.js +++ b/src/ol/control/rotatecontrol.js @@ -52,6 +52,8 @@ ol.control.Rotate = function(opt_options) { this.registerDisposable(handler); goog.events.listen(handler, ol.pointer.EventType.POINTERUP, ol.control.Rotate.prototype.resetNorth_, false, this); + goog.events.listen(button, goog.events.EventType.CLICK, + ol.control.Rotate.prototype.resetNorth_, false, this); goog.events.listen(button, [ goog.events.EventType.MOUSEOUT, @@ -92,7 +94,11 @@ goog.inherits(ol.control.Rotate, ol.control.Control); * @private */ ol.control.Rotate.prototype.resetNorth_ = function(pointerEvent) { - pointerEvent.browserEvent.preventDefault(); + if (goog.isDef(pointerEvent.browserEvent)) { + pointerEvent.browserEvent.preventDefault(); + } else if (pointerEvent.screenX !== 0 && pointerEvent.screenY !== 0) { + return; + } // prevent the anchor from getting appended to the url var map = this.getMap(); // FIXME works for View2D only diff --git a/src/ol/control/zoomcontrol.js b/src/ol/control/zoomcontrol.js index 4b8fe5154e..e05cf15c22 100644 --- a/src/ol/control/zoomcontrol.js +++ b/src/ol/control/zoomcontrol.js @@ -56,6 +56,9 @@ ol.control.Zoom = function(opt_options) { goog.events.listen(inElementHandler, ol.pointer.EventType.POINTERUP, goog.partial( ol.control.Zoom.prototype.zoomByDelta_, delta), false, this); + goog.events.listen(inElement, + goog.events.EventType.CLICK, goog.partial( + ol.control.Zoom.prototype.zoomByDelta_, delta), false, this); goog.events.listen(inElement, [ goog.events.EventType.MOUSEOUT, @@ -77,6 +80,9 @@ ol.control.Zoom = function(opt_options) { goog.events.listen(outElementHandler, ol.pointer.EventType.POINTERUP, goog.partial( ol.control.Zoom.prototype.zoomByDelta_, -delta), false, this); + goog.events.listen(outElement, + goog.events.EventType.CLICK, goog.partial( + ol.control.Zoom.prototype.zoomByDelta_, -delta), false, this); goog.events.listen(outElement, [ goog.events.EventType.MOUSEOUT, @@ -111,7 +117,11 @@ goog.inherits(ol.control.Zoom, ol.control.Control); * @private */ ol.control.Zoom.prototype.zoomByDelta_ = function(delta, pointerEvent) { - pointerEvent.browserEvent.preventDefault(); + if (goog.isDef(pointerEvent.browserEvent)) { + pointerEvent.browserEvent.preventDefault(); + } else if (pointerEvent.screenX !== 0 && pointerEvent.screenY !== 0) { + return; + } // prevent the anchor from getting appended to the url var map = this.getMap(); // FIXME works for View2D only diff --git a/src/ol/control/zoomtoextentcontrol.js b/src/ol/control/zoomtoextentcontrol.js index 03aa7fbbea..0be54736ba 100644 --- a/src/ol/control/zoomtoextentcontrol.js +++ b/src/ol/control/zoomtoextentcontrol.js @@ -48,6 +48,8 @@ ol.control.ZoomToExtent = function(opt_options) { this.registerDisposable(buttonHandler); goog.events.listen(buttonHandler, ol.pointer.EventType.POINTERUP, this.handleZoomToExtent_, false, this); + goog.events.listen(button, goog.events.EventType.CLICK, + this.handleZoomToExtent_, false, this); goog.events.listen(button, [ goog.events.EventType.MOUSEOUT, @@ -73,7 +75,11 @@ goog.inherits(ol.control.ZoomToExtent, ol.control.Control); * @private */ ol.control.ZoomToExtent.prototype.handleZoomToExtent_ = function(pointerEvent) { - pointerEvent.browserEvent.preventDefault(); + if (goog.isDef(pointerEvent.browserEvent)) { + pointerEvent.browserEvent.preventDefault(); + } else if (pointerEvent.screenX !== 0 && pointerEvent.screenY !== 0) { + return; + } // prevent #zoomExtent anchor from getting appended to the url var map = this.getMap(); var view = map.getView();