Use pointer events for button clicks

This commit is contained in:
ahocevar
2014-04-01 13:46:58 +02:00
parent ac25c3ad57
commit e05cff670b
3 changed files with 24 additions and 25 deletions

View File

@@ -12,6 +12,7 @@ goog.require('ol.animation');
goog.require('ol.control.Control');
goog.require('ol.css');
goog.require('ol.easing');
goog.require('ol.pointer.PointerEventHandler');
@@ -51,10 +52,9 @@ ol.control.Zoom = function(opt_options) {
'type' : 'button'
}, tTipZoomIn, zoomInLabel);
goog.events.listen(inElement, [
goog.events.EventType.TOUCHEND,
goog.events.EventType.CLICK
], goog.partial(ol.control.Zoom.prototype.zoomByDelta_, delta), false, this);
goog.events.listen(new ol.pointer.PointerEventHandler(inElement),
ol.pointer.EventType.POINTERUP, goog.partial(
ol.control.Zoom.prototype.zoomByDelta_, delta), false, this);
goog.events.listen(inElement, [
goog.events.EventType.MOUSEOUT,
@@ -71,10 +71,10 @@ ol.control.Zoom = function(opt_options) {
'class': className + '-out ol-has-tooltip',
'name' : 'ZoomOut'
}, tTipsZoomOut, zoomOutLabel);
goog.events.listen(outElement, [
goog.events.EventType.TOUCHEND,
goog.events.EventType.CLICK
], goog.partial(ol.control.Zoom.prototype.zoomByDelta_, -delta), false, this);
goog.events.listen(new ol.pointer.PointerEventHandler(outElement),
ol.pointer.EventType.POINTERUP, goog.partial(
ol.control.Zoom.prototype.zoomByDelta_, -delta), false, this);
goog.events.listen(outElement, [
goog.events.EventType.MOUSEOUT,
@@ -104,11 +104,11 @@ goog.inherits(ol.control.Zoom, ol.control.Control);
/**
* @param {number} delta Zoom delta.
* @param {goog.events.BrowserEvent} browserEvent The browser event to handle.
* @param {ol.pointer.PointerEvent} pointerEvent The pointer event to handle.
* @private
*/
ol.control.Zoom.prototype.zoomByDelta_ = function(delta, browserEvent) {
browserEvent.preventDefault();
ol.control.Zoom.prototype.zoomByDelta_ = function(delta, pointerEvent) {
pointerEvent.browserEvent.preventDefault();
// prevent the anchor from getting appended to the url
var map = this.getMap();
// FIXME works for View2D only