getting rid of unnecessary, undocumented 'drawn' property on marker. replacing it with accessor function isDrawn(), and putting an isDrawn() in icon as well. all tests pass r=elemoine (Closes #1759)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@8091 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2008-10-04 20:13:28 +00:00
parent 2e4faa3861
commit 8e3178984f
6 changed files with 76 additions and 4 deletions
+26
View File
@@ -33,6 +33,32 @@
icon.setOpacity(0.5);
t.eq(parseFloat(icon.imageDiv.style.opacity), 0.5, "icon.setOpacity() works");
}
function test_Icon_isDrawn(t) {
t.plan(4);
var icon = {};
//no imageDiv
var drawn = OpenLayers.Icon.prototype.isDrawn.apply(icon, []);
t.ok(!drawn, "icon with no imageDiv not drawn");
//imageDiv no parentNode
icon.imageDiv = {};
drawn = OpenLayers.Icon.prototype.isDrawn.apply(icon, []);
t.ok(!drawn, "icon with imageDiv with no parentNode not drawn");
//imageDiv with parent
icon.imageDiv.parentNode = {};
drawn = OpenLayers.Icon.prototype.isDrawn.apply(icon, []);
t.ok(drawn, "icon with imageDiv with parentNode drawn");
//imageDiv with parent but nodetype 11
icon.imageDiv.parentNode = {'nodeType': 11};
drawn = OpenLayers.Icon.prototype.isDrawn.apply(icon, []);
t.ok(!drawn, "imageDiv with parent but nodetype 11 not drawn");
}
</script>
+1
View File
@@ -46,6 +46,7 @@
t.ok(true, "removing marker when no markers present does not script error");
}
function test_Layer_Markers_destroy (t) {
t.plan( 1 );
layer = new OpenLayers.Layer.Markers('Test Layer');
+20
View File
@@ -134,6 +134,26 @@
t.eq(marker.lonlat.lat, map.getExtent().top, "on top edge of map");
map.destroy();
}
function test_Marker_isDrawn(t) {
t.plan(3);
var marker = {};
//no icon
var drawn = OpenLayers.Marker.prototype.isDrawn.apply(marker, []);
t.ok(!drawn, "marker with no icon not drawn");
//not drawn icon
marker.icon = { isDrawn: function() { return false; } };
drawn = OpenLayers.Marker.prototype.isDrawn.apply(marker, []);
t.ok(!drawn, "marker with not drawn icon not drawn");
//drawn icon
marker.icon.isDrawn = function() { return true; };
drawn = OpenLayers.Marker.prototype.isDrawn.apply(marker, []);
t.ok(drawn, "marker with drawn icon drawn");
}
</script>
</head>