X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcss.js;h=eb7567f79dbebabe92da461b9762b8a2ebf5c114;hb=2bda99c18a0372eed02472e9d318676e180281da;hp=7a96020db012b864348abbe4187a9eb82653ca58;hpb=c36596ea58a69f7772b61829f8d0609a6fb1d9a0;p=jquery.git

diff --git a/src/css.js b/src/css.js
index 7a96020..eb7567f 100644
--- a/src/css.js
+++ b/src/css.js
@@ -66,7 +66,7 @@ jQuery.extend({
 				value += "px";
 			}
 
-			if ( !("set" in hooks) || (value = hooks.set( elem, value )) === undefined ) {
+			if ( !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
 				style[ name ] = value;
 			}
 
@@ -77,7 +77,7 @@ jQuery.extend({
 			} else if ( !force && style[ name ] ) {
 				ret = style[ name ];
 
-			} else if ( curCSS ) {
+			} else if ( force !== false && curCSS ) {
 				ret = curCSS( elem, name, origName );
 			}
 
@@ -123,7 +123,11 @@ jQuery.each(["height", "width"], function( i, name ) {
 
 		set: function( elem, value ) {
 			// ignore negative width and height values #1599
-			return Math.max( parseFloat(value), 0 ) + "px";
+			value = parseFloat(value);
+
+			if ( value >= 0 ) {
+				return value + "px";
+			}
 		}
 	};
 });