X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=715fbf11016255869b0e686ffa0d17cc14a12432;hb=14fa1e858c91cbb354009bc68fbd893ed4ff540c;hp=ddb08a4381f980e417d8ca22552b92ff97b41d09;hpb=9c94ef4c411867d38f301ccbf406af21e277188c;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index ddb08a4..715fbf1 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1373,7 +1373,7 @@ jQuery.extend({ }); jQuery.swap( e, old, function() { - if (jQuery.css(e,"display") != "none") { + if ( jQuery(e).is(':visible') ) { oHeight = e.offsetHeight; oWidth = e.offsetWidth; } else { @@ -1383,14 +1383,14 @@ jQuery.extend({ visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0" }).appendTo(e.parentNode)[0]; - var parPos = jQuery.css(e.parentNode,"position"); - if ( parPos == "" || parPos == "static" ) + var parPos = jQuery.css(e.parentNode,"position") || "static"; + if ( parPos == "static" ) e.parentNode.style.position = "relative"; oHeight = e.clientHeight; oWidth = e.clientWidth; - if ( parPos == "" || parPos == "static" ) + if ( parPos == "static" ) e.parentNode.style.position = "static"; e.parentNode.removeChild(e);