Erik helps me fix tests. I threaten to kill him for criticizing my lack
of semicolons. All is well. Fix for "keep selected features drawn with the right style". (Closes #916) git-svn-id: http://svn.openlayers.org/trunk/openlayers@4232 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -161,7 +161,8 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
feature.originalStyle = feature.style;
|
feature.originalStyle = feature.style;
|
||||||
}
|
}
|
||||||
this.layer.selectedFeatures.push(feature);
|
this.layer.selectedFeatures.push(feature);
|
||||||
this.layer.drawFeature(feature, this.selectStyle);
|
feature.style = this.selectStyle;
|
||||||
|
this.layer.drawFeature(feature);
|
||||||
this.onSelect(feature);
|
this.onSelect(feature);
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -175,10 +176,10 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
*/
|
*/
|
||||||
unselect: function(feature) {
|
unselect: function(feature) {
|
||||||
// Store feature style for restoration later
|
// Store feature style for restoration later
|
||||||
if(feature.originalStyle == null) {
|
if(feature.originalStyle != null) {
|
||||||
feature.originalStyle = feature.style;
|
feature.style = feature.originalStyle;
|
||||||
}
|
}
|
||||||
this.layer.drawFeature(feature, feature.originalStyle);
|
this.layer.drawFeature(feature);
|
||||||
OpenLayers.Util.removeItem(this.layer.selectedFeatures, feature);
|
OpenLayers.Util.removeItem(this.layer.selectedFeatures, feature);
|
||||||
this.onUnselect(feature);
|
this.onUnselect(feature);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -32,6 +32,21 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function test_Control_SelectFeature_select(t) {
|
||||||
|
t.plan(2);
|
||||||
|
var map = new OpenLayers.Map("map");
|
||||||
|
var layer = new OpenLayers.Layer.Vector();
|
||||||
|
map.addLayer(layer);
|
||||||
|
var control = new OpenLayers.Control.SelectFeature(layer);
|
||||||
|
var feature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(0,0));
|
||||||
|
layer.addFeatures(feature);
|
||||||
|
layer.drawFeature = function() { }
|
||||||
|
control.select(feature);
|
||||||
|
t.eq(feature.style.strokeColor, OpenLayers.Feature.Vector.style['select'].strokeColor, "feature style is set to select style");
|
||||||
|
control.unselect(feature);
|
||||||
|
t.eq(feature.style.strokeColor, OpenLayers.Feature.Vector.style['default'].strokeColor, "feature style is set back to old style");
|
||||||
|
}
|
||||||
|
|
||||||
function test_Control_SelectFeature_activate(t) {
|
function test_Control_SelectFeature_activate(t) {
|
||||||
t.plan(2);
|
t.plan(2);
|
||||||
var map = new OpenLayers.Map("map");
|
var map = new OpenLayers.Map("map");
|
||||||
|
|||||||
Reference in New Issue
Block a user