(no commit message)

[jquery.git] / src / jquery / jquery.js

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 1893498..9965fd3 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1461,6 +1461,9 @@ jQuery.extend({
                
                if (prop == 'opacity' && jQuery.browser.msie)
                        return jQuery.attr(elem.style, 'opacity');
+                       
+               if (prop == "float" || prop == "cssFloat")
+                   prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
 
                if (!force && elem.style[prop]) {
 
@@ -1824,7 +1827,8 @@ jQuery.extend({
                var fix = {
                        "for": "htmlFor",
                        "class": "className",
-                       "float": "cssFloat",
+                       "float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
+                       cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
                        innerHTML: "innerHTML",
                        className: "className",
                        value: "value",
@@ -1853,7 +1857,7 @@ jQuery.extend({
                        return elem[fix[name]];
                } else if( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') ) {
                        return elem.getAttributeNode(name).nodeValue;
-               } else if ( elem.getAttribute != undefined ) {
+               } else if ( elem.getAttribute != undefined && elem.tagName ) { // IE elem.getAttribute passes even for style
                        if ( value != undefined ) elem.setAttribute( name, value );
                        return elem.getAttribute( name, 2 );
                } else {