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

Remove touch events handling in handleMouse* handlers

Browse Source
This commit is contained in:
Frederic Junod
2013-01-28 15:02:28 +01:00
parent 0296380807
commit dc40ac6831
1 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/ol/mapbrowserevent.js
View File

@@ -148,34 +148,14 @@ ol.MapBrowserEventHandler = function(map) {
this.clickListenerKey_ = goog.events.listen(element, this.clickListenerKey_ = goog.events.listen(element,
[goog.events.EventType.CLICK, goog.events.EventType.DBLCLICK], [goog.events.EventType.CLICK, goog.events.EventType.DBLCLICK],
this.click_, false, this); this.click_, false, this);
this.downListenerKey_ = goog.events.listen(element,
goog.events.EventType.MOUSEDOWN,
this.handleMouseDown_, false, this);
} }
this.downListenerKey_ = goog.events.listen(element,
ol.BrowserFeature.HAS_TOUCH ?
goog.events.EventType.TOUCHSTART :
goog.events.EventType.MOUSEDOWN,
this.handleMouseDown_, false, this);
}; };
goog.inherits(ol.MapBrowserEventHandler, goog.events.EventTarget); goog.inherits(ol.MapBrowserEventHandler, goog.events.EventTarget);
/**
* @param {goog.events.BrowserEvent} browserEvent Browser event.
* @private
*/
ol.MapBrowserEventHandler.prototype.touchEnableBrowserEvent_ =
function(browserEvent) {
if (ol.BrowserFeature.HAS_TOUCH) {
goog.asserts.assert(browserEvent instanceof goog.events.BrowserEvent);
var nativeEvent = browserEvent.getBrowserEvent();
if (nativeEvent.touches && nativeEvent.touches.length) {
var nativeTouch = nativeEvent.touches[0];
browserEvent.clientX = nativeTouch.clientX;
browserEvent.clientY = nativeTouch.clientY;
}
}
};
/** /**
* @param {goog.events.BrowserEvent} browserEvent Browser event. * @param {goog.events.BrowserEvent} browserEvent Browser event.
* @private * @private
@@ -236,7 +216,6 @@ ol.MapBrowserEventHandler.prototype.handleMouseDown_ = function(browserEvent) {
ol.MapBrowserEvent.EventType.DOWN, this.map_, browserEvent); ol.MapBrowserEvent.EventType.DOWN, this.map_, browserEvent);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);
if (!this.previous_) { if (!this.previous_) {
this.touchEnableBrowserEvent_(browserEvent);
this.down_ = browserEvent; this.down_ = browserEvent;
this.previous_ = { this.previous_ = {
clientX: browserEvent.clientX, clientX: browserEvent.clientX,
@@ -244,21 +223,13 @@ ol.MapBrowserEventHandler.prototype.handleMouseDown_ = function(browserEvent) {
}; };
this.dragged_ = false; this.dragged_ = false;
this.dragListenerKeys_ = [ this.dragListenerKeys_ = [
goog.events.listen(document, goog.events.listen(document, goog.events.EventType.MOUSEMOVE,
ol.BrowserFeature.HAS_TOUCH ?
goog.events.EventType.TOUCHMOVE :
goog.events.EventType.MOUSEMOVE,
this.handleMouseMove_, false, this), this.handleMouseMove_, false, this),
goog.events.listen(document, goog.events.listen(document, goog.events.EventType.MOUSEUP,
ol.BrowserFeature.HAS_TOUCH ?
goog.events.EventType.TOUCHEND :
goog.events.EventType.MOUSEUP,
this.handleMouseUp_, false, this) this.handleMouseUp_, false, this)
]; ];
if (browserEvent.type === goog.events.EventType.MOUSEDOWN) { // prevent browser image dragging with the dom renderer
// prevent browser image dragging on pointer devices browserEvent.preventDefault();
browserEvent.preventDefault();
}
} }
}; };
@@ -275,13 +246,10 @@ ol.MapBrowserEventHandler.prototype.handleMouseMove_ = function(browserEvent) {
ol.MapBrowserEvent.EventType.DRAGSTART, this.map_, this.down_); ol.MapBrowserEvent.EventType.DRAGSTART, this.map_, this.down_);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);
} }
this.touchEnableBrowserEvent_(browserEvent);
this.previous_ = { this.previous_ = {
clientX: browserEvent.clientX, clientX: browserEvent.clientX,
clientY: browserEvent.clientY clientY: browserEvent.clientY
}; };
// prevent viewport dragging on touch devices
browserEvent.preventDefault();
newEvent = new ol.MapBrowserEvent( newEvent = new ol.MapBrowserEvent(
ol.MapBrowserEvent.EventType.DRAG, this.map_, browserEvent); ol.MapBrowserEvent.EventType.DRAG, this.map_, browserEvent);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);