Changeset 7299

Timestamp:

05/31/08 13:11:24 (3 months ago)

Author:

crschmidt

Message:

Fix for "Util.modifyAlphaImageDiv makes hidden elements reappear in IE6.".
Patch by jwpage. (Closes #1520)

Files:

• trunk/openlayers/lib/OpenLayers/Util.js (modified) (1 diff)
• trunk/openlayers/tests/Util.html (modified) (3 diffs)

trunk/openlayers/lib/OpenLayers/Util.js

@@ -428 +428 @@
-    
-    if (OpenLayers.Util.alphaHack()) {
-
-
+
+
+
-        if (sizing == null) {
-            sizing = "scale";

trunk/openlayers/tests/Util.html

@@ -401 +401 @@
-
-    function test_Util_modifyAlphaImageDiv(t) {
-19
+20
-
-        var imageDiv = OpenLayers.Util.createAlphaImageDiv();
@@ -461 +461 @@
-        if (OpenLayers.Util.alphaHack()) {
-        
-            t.eq(imageDiv.style.display, "inline-block", "imageDiv.style.display set correctly");
-
-            var filter = "progid:DXImageTransform.Microsoft" +
-                         ".AlphaImageLoader(src='" + img + "', " +
@@ -476 +474 @@
-            t.ok(true, "image filter value not set (not in IE)");
-        }
+
+        var imageDiv = OpenLayers.Util.createAlphaImageDiv();
+        var display = "none";
+        imageDiv.style.display = display;
+        OpenLayers.Util.modifyAlphaImageDiv(imageDiv, id, xy, sz, img, position, border, sizing, opacity);
+        t.eq(imageDiv.style.display, display, "imageDiv.style.display set correctly, if 'none'");
+
+        var imageDiv = OpenLayers.Util.createAlphaImageDiv();
+        var display = "block";
+        imageDiv.style.display = display;
+        OpenLayers.Util.modifyAlphaImageDiv(imageDiv, id, xy, sz, img, position, border, sizing, opacity);
+        t.eq(imageDiv.style.display, "inline-block", "imageDiv.style.display set correctly, if not 'none'");
+
+        
-
-        var imageDiv = OpenLayers.Util.createAlphaImageDiv(id, xy, sz, img, position, border, "scale", opacity);