ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use pointer events for button clicks

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ol/control/fullscreencontrol.js
View File

@@ -10,6 +10,7 @@ goog.require('googx.dom.fullscreen');
goog.require('googx.dom.fullscreen.EventType'); goog.require('googx.dom.fullscreen.EventType');
goog.require('ol.control.Control'); goog.require('ol.control.Control');
goog.require('ol.css'); goog.require('ol.css');
goog.require('ol.pointer.PointerEventHandler');
@@ -47,10 +48,8 @@ ol.control.FullScreen = function(opt_options) {
' ol-has-tooltip' ' ol-has-tooltip'
}); });
goog.dom.appendChild(button, tip); goog.dom.appendChild(button, tip);
goog.events.listen(button, [ goog.events.listen(new ol.pointer.PointerEventHandler(button),
goog.events.EventType.CLICK, ol.pointer.EventType.POINTERUP, this.handleClick_, false, this);
goog.events.EventType.TOUCHEND
], this.handleClick_, false, this);
goog.events.listen(button, [ goog.events.listen(button, [
goog.events.EventType.MOUSEOUT, goog.events.EventType.MOUSEOUT,
@@ -84,14 +83,14 @@ goog.inherits(ol.control.FullScreen, ol.control.Control);
/** /**
* @param {goog.events.BrowserEvent} browserEvent Browser event. * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
* @private * @private
*/ */
ol.control.FullScreen.prototype.handleClick_ = function(browserEvent) { ol.control.FullScreen.prototype.handleClick_ = function(pointerEvent) {
if (!googx.dom.fullscreen.isSupported()) { if (!googx.dom.fullscreen.isSupported()) {
return; return;
} }
browserEvent.preventDefault(); pointerEvent.browserEvent.preventDefault();
var map = this.getMap(); var map = this.getMap();
if (goog.isNull(map)) { if (goog.isNull(map)) {
return; return;

22
src/ol/control/zoomcontrol.js
View File

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

14
src/ol/control/zoomtoextentcontrol.js
View File

@@ -9,6 +9,7 @@ goog.require('goog.events');
goog.require('goog.events.EventType'); goog.require('goog.events.EventType');
goog.require('ol.control.Control'); goog.require('ol.control.Control');
goog.require('ol.css'); goog.require('ol.css');
goog.require('ol.pointer.PointerEventHandler');
@@ -47,10 +48,9 @@ ol.control.ZoomToExtent = function(opt_options) {
goog.dom.appendChild(button, tip); goog.dom.appendChild(button, tip);
goog.dom.appendChild(element, button); goog.dom.appendChild(element, button);
goog.events.listen(button, [ goog.events.listen(new ol.pointer.PointerEventHandler(button),
goog.events.EventType.TOUCHEND, ol.pointer.EventType.POINTERUP,
goog.events.EventType.CLICK this.handleZoomToExtent_, false, this);
], this.handleZoomToExtent_, false, this);
goog.events.listen(button, [ goog.events.listen(button, [
goog.events.EventType.MOUSEOUT, goog.events.EventType.MOUSEOUT,
@@ -68,11 +68,11 @@ goog.inherits(ol.control.ZoomToExtent, ol.control.Control);
/** /**
* @param {goog.events.BrowserEvent} browserEvent Browser event. * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
* @private * @private
*/ */
ol.control.ZoomToExtent.prototype.handleZoomToExtent_ = function(browserEvent) { ol.control.ZoomToExtent.prototype.handleZoomToExtent_ = function(pointerEvent) {
browserEvent.preventDefault(); pointerEvent.browserEvent.preventDefault();
// prevent #zoomExtent anchor from getting appended to the url // prevent #zoomExtent anchor from getting appended to the url
var map = this.getMap(); var map = this.getMap();
var view = map.getView(); var view = map.getView();