diff options
| author | Brandon Aaron <brandon.aaron@gmail.com> | 2007-02-09 19:52:31 +0000 |
|---|---|---|
| committer | Brandon Aaron <brandon.aaron@gmail.com> | 2007-02-09 19:52:31 +0000 |
| commit | 81f138d77e92e4deb6057cead988ebb679370973 (patch) | |
| tree | e30503274a0e31f932599a39ea6139fb7d39f4b4 /src/jquery/jquery.js | |
| parent | 46806957f478d4f1435f13768cc85c1a39996d33 (diff) | |
| download | jquery-81f138d77e92e4deb6057cead988ebb679370973.tar.gz jquery-81f138d77e92e4deb6057cead988ebb679370973.zip | |
Get actual values for attributes in IE and fix #910 so that it does not crash safari
Diffstat (limited to 'src/jquery/jquery.js')
| -rw-r--r-- | src/jquery/jquery.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index befaef64d..3693ee373 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1470,7 +1470,7 @@ jQuery.extend({ if ( arg.length === 0 ) return; - if ( arg[0] == undefined || jQuery.nodeName(arg[0],"form") ) + if ( arg[0] == undefined || (jQuery.browser.msie && jQuery.nodeName(arg,"form")) ) r.push( arg ); else r = jQuery.merge( r, arg ); @@ -1495,6 +1495,8 @@ jQuery.extend({ selected: "selected" }; + var fixIE = jQuery.isXMLDoc(elem) ? [] : "href,src,background,cite,classid,codebase,data,longdesc,profile,usemap".split(','); + // IE actually uses filters for opacity ... elem is actually elem.style if ( name == "opacity" && jQuery.browser.msie && value != undefined ) { // IE has trouble with opacity if it does not have layout @@ -1525,7 +1527,7 @@ jQuery.extend({ // IE elem.getAttribute passes even for style else if ( elem.tagName ) { if ( value != undefined ) elem.setAttribute( name, value ); - if ( name == "href" && jQuery.browser.msie && !jQuery.isXMLDoc(elem) ) return elem.getAttribute( name, 2 ); + if ( jQuery.browser.msie && fixIE[name] ) return elem.getAttribute( name, 2 ); return elem.getAttribute( name ); // elem is actually elem.style ... set the style |