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

Handler.Feature may not trigger click when touching a feature, r=sbrunner

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@11943 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Éric Lemoine
2011-05-03 14:09:09 +00:00
parent e4d13784fa
commit 53984809ce
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/OpenLayers/Handler/Feature.js
View File

@@ -271,7 +271,7 @@ OpenLayers.Handler.Feature = OpenLayers.Class(OpenLayers.Handler, {
var type = evt.type;
var handled = false;
var previouslyIn = !!(this.feature); // previously in a feature
var click = (type == "click" || type == "dblclick");
var click = (type == "click" || type == "dblclick" || type == "touchstart");
this.feature = this.layer.getFeatureFromEvent(evt);
if(this.feature && !this.feature.layer) {
// feature has been destroyed
@@ -282,7 +282,7 @@ OpenLayers.Handler.Feature = OpenLayers.Class(OpenLayers.Handler, {
this.lastFeature = null;
}
if(this.feature) {
if(evt.type === "touchstart") {
if(type === "touchstart") {
// stop the event to prevent Android Webkit from
// "flashing" the map div
OpenLayers.Event.stop(evt);

8
tests/Handler/Feature.html
View File

@@ -123,7 +123,7 @@
}
function test_callbacks(t) {
t.plan(13);
t.plan(14);
var map = new OpenLayers.Map('map', {controls: []});
var control = new OpenLayers.Control();
@@ -235,6 +235,12 @@
evtPx.type = "touchstart";
map.events.triggerEvent('touchstart', evtPx);
// test touchstart on the same feature
// 'click' callback should be called
callbacks['click'] = getCallback('click (touch)', newFeature);
evtPx.type = "touchstart";
map.events.triggerEvent('touchstart', evtPx);
// test touchstart in new feature and out of last feature
// both 'click' and 'clickout' callbacks should be called
lastFeature = newFeature;