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

Fix for "Util.modifyAlphaImageDiv makes hidden elements reappear in IE6.".

Browse Source 
Patch by jwpage. (Closes #1520) 


git-svn-id: http://svn.openlayers.org/trunk/openlayers@7299 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2008-05-31 17:11:24 +00:00
parent 87f26c231e
commit 57237e8a58
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Util.js
+3 -2
View File
@@ -427,8 +427,9 @@ OpenLayers.Util.modifyAlphaImageDiv = function(div, id, px, sz, imgURL,
"relative", border); "relative", border);
if (OpenLayers.Util.alphaHack()) { if (OpenLayers.Util.alphaHack()) {
if(div.style.display != "none") {
div.style.display = "inline-block"; div.style.display = "inline-block";
}
if (sizing == null) { if (sizing == null) {
sizing = "scale"; sizing = "scale";
} }
tests/Util.html
+15 -3
View File
@@ -400,7 +400,7 @@
} }
function test_Util_modifyAlphaImageDiv(t) { function test_Util_modifyAlphaImageDiv(t) {
t.plan( 19 ); t.plan( 20 );
var imageDiv = OpenLayers.Util.createAlphaImageDiv(); var imageDiv = OpenLayers.Util.createAlphaImageDiv();
@@ -460,8 +460,6 @@
if (OpenLayers.Util.alphaHack()) { if (OpenLayers.Util.alphaHack()) {
t.eq(imageDiv.style.display, "inline-block", "imageDiv.style.display set correctly");
var filter = "progid:DXImageTransform.Microsoft" + var filter = "progid:DXImageTransform.Microsoft" +
".AlphaImageLoader(src='" + img + "', " + ".AlphaImageLoader(src='" + img + "', " +
"sizingMethod='" + sizing + "') alpha(opacity=" + opacity *100 + ")"; "sizingMethod='" + sizing + "') alpha(opacity=" + opacity *100 + ")";
@@ -476,6 +474,20 @@
t.ok(true, "image filter value not set (not in IE)"); 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); var imageDiv = OpenLayers.Util.createAlphaImageDiv(id, xy, sz, img, position, border, "scale", opacity);
if (OpenLayers.Util.alphaHack()) { if (OpenLayers.Util.alphaHack()) {
var filter = "progid:DXImageTransform.Microsoft" + var filter = "progid:DXImageTransform.Microsoft" +