X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=9965fd3497389042ecb6c25f8c705f9eb26ac56e;hb=6de5a6b96a72f7b0b2cc54fa7df5410664b6e18b;hp=1893498da749341aaee30b7adb7c47e2f45520c6;hpb=dbee06de85859af59591813d3004e6695b8bb278;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 1893498..9965fd3 100644
--- 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 {