X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=12f9d514e74b3f6c8f0dd59ff6d5bbb8bc69da35;hb=ec3ebd3e8a7dfda15d227ea3dd21361e534beac3;hp=f77497b4fb3866e1d00353cb5cd2a00b86372e69;hpb=b763cc6602fdf2bede16be5bf106ceaa1d1d0525;p=jquery.git diff --git a/src/css.js b/src/css.js index f77497b..12f9d51 100644 --- a/src/css.js +++ b/src/css.js @@ -120,12 +120,18 @@ jQuery.extend({ }, curCSS: function( elem, name, force ) { - var ret, style = elem.style; + var ret, style = elem.style, filter; // IE uses filters for opacity if ( !jQuery.support.opacity && name == "opacity" ) { - ret = style.filter && style.filter.indexOf("opacity=") >= 0 ? - (parseFloat( style.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '': + filter = (filter = style.filter) && filter.indexOf("opacity=") >= 0 ? + filter : + (filter = elem.currentStyle[ 'filter' ]) && filter.indexOf("opacity=") >= 0 ? + filter : + null; + + ret = filter && filter.indexOf("opacity=") >= 0 ? + (parseFloat( filter.match(/opacity=([^)]*)/)[1] ) / 100) + '': ""; return ret === "" ?