diff options
author | Brandon Aaron <brandon.aaron@gmail.com> | 2007-07-02 15:27:58 +0000 |
---|---|---|
committer | Brandon Aaron <brandon.aaron@gmail.com> | 2007-07-02 15:27:58 +0000 |
commit | b9a8e65576615974228e493155c8c85dc25f09d8 (patch) | |
tree | f732154d741d096650badc10d3839e42c0e6145f /src/jquery | |
parent | fdd437800d983346c5936abedcf292c2a612b892 (diff) | |
download | jquery-b9a8e65576615974228e493155c8c85dc25f09d8.tar.gz jquery-b9a8e65576615974228e493155c8c85dc25f09d8.zip |
fix opacity issues in IE
Diffstat (limited to 'src/jquery')
-rw-r--r-- | src/jquery/jquery.js | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index ef728f032..1d0d28133 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1565,7 +1565,16 @@ jQuery.extend({ // IE elem.getAttribute passes even for style else if ( elem.tagName ) { - // IE actually uses filters for opacity ... elem is actually elem.style + + + if ( value != undefined ) elem.setAttribute( name, value ); + if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) + return elem.getAttribute( name, 2 ); + return elem.getAttribute( name ); + + // elem is actually elem.style ... set the style + } else { + // IE actually uses filters for opacity if ( name == "opacity" && jQuery.browser.msie ) { if ( value != undefined ) { // IE has trouble with opacity if it does not have layout @@ -1580,14 +1589,6 @@ jQuery.extend({ return elem.filter ? (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : ""; } - - if ( value != undefined ) elem.setAttribute( name, value ); - if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) - return elem.getAttribute( name, 2 ); - return elem.getAttribute( name ); - - // elem is actually elem.style ... set the style - } else { name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();}); if ( value != undefined ) elem[name] = value; return elem[name]; |