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

Only consider touch events to compute ol.interaction.Touch.targetTouches

Browse Source
This commit is contained in:
Frederic Junod
2013-08-28 10:40:47 +02:00
parent 2b5e0c2c31
commit 77f6b4ff59
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/touchinteraction.js
+30 -10
View File
@@ -1,6 +1,7 @@
goog.provide('ol.interaction.Touch'); goog.provide('ol.interaction.Touch');
goog.require('goog.asserts');
goog.require('goog.functions'); goog.require('goog.functions');
goog.require('goog.object'); goog.require('goog.object');
goog.require('ol.MapBrowserEvent'); goog.require('ol.MapBrowserEvent');
@@ -57,24 +58,43 @@ ol.interaction.Touch.centroid = function(touches) {
}; };
/**
* @param {ol.MapBrowserEvent} mapBrowserEvent Event.
* @return {boolean} Whether the event is a touchstart, touchmove
* or touchend event.
* @private
*/
ol.interaction.Touch.isTouchEvent_ = function(mapBrowserEvent) {
var type = mapBrowserEvent.type;
return (
type === ol.MapBrowserEvent.EventType.TOUCHSTART ||
type === ol.MapBrowserEvent.EventType.TOUCHMOVE ||
type === ol.MapBrowserEvent.EventType.TOUCHEND);
};
/** /**
* @param {ol.MapBrowserEvent} mapBrowserEvent Event. * @param {ol.MapBrowserEvent} mapBrowserEvent Event.
* @private * @private
*/ */
ol.interaction.Touch.prototype.updateTrackedTouches_ = ol.interaction.Touch.prototype.updateTrackedTouches_ =
function(mapBrowserEvent) { function(mapBrowserEvent) {
var event = mapBrowserEvent.browserEvent.getBrowserEvent(); if (ol.interaction.Touch.isTouchEvent_(mapBrowserEvent)) {
if (goog.isDef(event.targetTouches)) { var event = mapBrowserEvent.browserEvent.getBrowserEvent();
// W3C touch events if (goog.isDef(event.targetTouches)) {
this.targetTouches = event.targetTouches; // W3C touch events
} else { this.targetTouches = event.targetTouches;
// IE pointer event } else if (goog.isDef(event.pointerId)) {
if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.TOUCHEND) { // IE pointer event
delete this.trackedTouches_[event.pointerId]; if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.TOUCHEND) {
delete this.trackedTouches_[event.pointerId];
} else {
this.trackedTouches_[event.pointerId] = event;
}
this.targetTouches = goog.object.getValues(this.trackedTouches_);
} else { } else {
this.trackedTouches_[event.pointerId] = event; goog.asserts.fail('unknown touch event model');
} }
this.targetTouches = goog.object.getValues(this.trackedTouches_);
} }
}; };