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

Only start dragging when we are over a feature. r=tschaub (closes #3252)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@11888 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2011-04-09 12:22:52 +00:00
parent 32f70d06c2
commit a3655cd66f
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/OpenLayers/Control/DragFeature.js
View File

@@ -171,7 +171,7 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, {
* feature - {<OpenLayers.Feature.Vector>} * feature - {<OpenLayers.Feature.Vector>}
*/ */
clickFeature: function(feature) { clickFeature: function(feature) {
if (this.overFeature(feature)) { if (!this.over && this.overFeature(feature)) {
this.handlers.drag.dragstart(this.handlers.feature.evt); this.handlers.drag.dragstart(this.handlers.feature.evt);
// to let the events propagate to the feature handler (click callback) // to let the events propagate to the feature handler (click callback)
this.handlers.drag.stopDown = false; this.handlers.drag.stopDown = false;
@@ -186,8 +186,10 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, {
* feature - {<OpenLayers.Feature.Vector>} * feature - {<OpenLayers.Feature.Vector>}
*/ */
clickoutFeature: function(feature) { clickoutFeature: function(feature) {
this.outFeature(feature); if (this.over) {
this.handlers.drag.stopDown = true; this.outFeature(feature);
this.handlers.drag.stopDown = true;
}
}, },
/** /**

18
tests/Control/DragFeature.html
View File

@@ -357,6 +357,24 @@
"onLeave called with expected feature"); "onLeave called with expected feature");
} }
function test_Control_DragFeature_click(t) {
t.plan(1);
var map = new OpenLayers.Map("map");
var layer = new OpenLayers.Layer.Vector();
map.addLayer(layer);
var feature = new OpenLayers.Feature.Vector();
feature.layer = layer;
var control = new OpenLayers.Control.DragFeature(layer);
map.addControl(control);
control.activate();
control.overFeature(feature);
control.handlers.feature.evt = {which: 1};
control.clickFeature(feature);
t.eq(control.handlers.drag.started, false, "click after over does not start drag handler");
}
</script> </script>
</head> </head>
<body> <body>