Changeset 8091

Timestamp:

10/04/08 16:13:28 (2 months ago)

Author:

euzuro

Message:

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)

Files:

• trunk/openlayers/lib/OpenLayers/Icon.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Markers.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Marker.js (modified) (1 diff)
• trunk/openlayers/tests/Icon.html (modified) (1 diff)
• trunk/openlayers/tests/Layer/Markers.html (modified) (1 diff)
• trunk/openlayers/tests/Marker.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Icon.js

@@ -194 +194 @@
-        this.imageDiv.style.display = (display) ? "" : "none"; 
-    },
+    
+
+    /**
+     * APIMethod: isDrawn
+     * 
+     * Returns:
+     * {Boolean} Whether or not the icon is drawn.
+     */
+    isDrawn: function() {
+        // nodeType 11 for ie, whose nodes *always* have a parentNode
+        // (of type document fragment)
+        var isDrawn = (this.imageDiv && this.imageDiv.parentNode && 
+                       (this.imageDiv.parentNode.nodeType != 11));    
+
+        return isDrawn;   
+    },
-
-    CLASS_NAME: "OpenLayers.Icon"

trunk/openlayers/lib/OpenLayers/Layer/Markers.js

@@ -126 +126 @@
-                (marker.icon.imageDiv.parentNode == this.div) ) {
-                this.div.removeChild(marker.icon.imageDiv);    
-                marker.drawn = false;
-            }
-        }
@@ -157 +156 @@
-            marker.display(false);
-        } else {
-var markerImg = marker.draw(px);
-if (!marker.drawn) {
+if (!marker.isDrawn()) {
+    var markerImg = marker.draw(px);
-                this.div.appendChild(markerImg);
-                marker.drawn = true;
-            }
-        }

trunk/openlayers/lib/OpenLayers/Marker.js

@@ -131 +131 @@
-
-    /**
+     * APIMethod: isDrawn
+     * 
+     * Returns:
+     * {Boolean} Whether or not the marker is drawn.
+     */
+    isDrawn: function() {
+        var isDrawn = (this.icon && this.icon.isDrawn());
+        return isDrawn;   
+    },
+
+    /**
-     * Method: onScreen
-     *

trunk/openlayers/tests/Icon.html

@@ -34 +34 @@
-        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");
+    }
+
-
-

trunk/openlayers/tests/Layer/Markers.html

@@ -47 +47 @@
-
-    }
+    
-    function test_Layer_Markers_destroy (t) {
-        t.plan( 1 );    

trunk/openlayers/tests/Marker.html

@@ -135 +135 @@
-        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>