X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcss.js;h=eb7567f79dbebabe92da461b9762b8a2ebf5c114;hb=2131e1a7ad6d9df239ec00b301303e10dbd34d49;hp=dd0ca4e296ad7d0ca8560b872d785199a805520a;hpb=c168c30a6afb1b3af1dee81119dbfdd3bef50d61;p=jquery.git

diff --git a/src/css.js b/src/css.js
index dd0ca4e..eb7567f 100644
--- a/src/css.js
+++ b/src/css.js
@@ -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";
+			}
 		}
 	};
 });