X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcss.js;h=ad0da6469919b513d891712b95aba1a8c65ba41c;hb=266facc08a2e1c8cb5a7a60de304da47657f2227;hp=0f08227b28d0989fc80b75e0cd5df4b9071611a8;hpb=d684122be0ce3484fb9a4ead11db98d18c5805e7;p=jquery.git

diff --git a/src/css.js b/src/css.js
index 0f08227..ad0da64 100644
--- a/src/css.js
+++ b/src/css.js
@@ -5,21 +5,25 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
 	rfloat = /float/i,
 	rdashAlpha = /-([a-z])/ig,
 	rupper = /([A-Z])/g,
-	rnumpx = /^\d+(?:px)?$/i,
-	rnum = /^\d/,
+	rnumpx = /^-?\d+(?:px)?$/i,
+	rnum = /^-?\d/,
+
+	cssShow = { position: "absolute", visibility: "hidden", display:"block" },
+	cssWidth = [ "Left", "Right" ],
+	cssHeight = [ "Top", "Bottom" ],
 
 	// cache check for defaultView.getComputedStyle
 	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
 	// normalize float css property
 	styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
-	fcamelCase = function(all, letter){
+	fcamelCase = function( all, letter ) {
 		return letter.toUpperCase();
 	};
 
 jQuery.fn.css = function( name, value ) {
-	return access( this, name, value, true, function( elem, name, value ) {
-		if (value === undefined) {
-			return jQuery.css( elem, name );
+	return jQuery.access( this, name, value, true, function( elem, name, value ) {
+		if ( value === undefined ) {
+			return jQuery.curCSS( elem, name );
 		}
 		
 		if ( typeof value === "number" && !rexclude.test(name) ) {
@@ -52,13 +56,13 @@ jQuery.extend({
 				style.zoom = 1;
 
 				// Set the alpha filter to set the opacity
-				var opacity = parseInt( value, 10 ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
-				var filter = style.filter || jQuery.curCSS( elem, 'filter' ) || "";
+				var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
+				var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
 				style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
 			}
 
 			return style.filter && style.filter.indexOf("opacity=") >= 0 ?
-				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + '':
+				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
 				"";
 		}
 
@@ -78,30 +82,13 @@ jQuery.extend({
 
 	css: function( elem, name, force, extra ) {
 		if ( name === "width" || name === "height" ) {
-			var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name === "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
-
-			function getWH() {
-				val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
-
-				if ( extra === "border" ) { return; }
-
-				jQuery.each( which, function() {
-					if ( !extra ) {
-						val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					}
-
-					if ( extra === "margin" ) {
-						val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
-					} else {
-						val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-					}
-				});
-			}
-
 			if ( elem.offsetWidth !== 0 ) {
-				getWH();
+				val = getWH( elem, name, extra );
+
 			} else {
-				jQuery.swap( elem, props, getWH );
+				jQuery.swap( elem, cssShow, function() {
+					val = getWH( elem, name, extra );
+				});
 			}
 
 			return Math.max(0, Math.round(val));
@@ -141,7 +128,13 @@ jQuery.extend({
 
 			name = name.replace( rupper, "-$1" ).toLowerCase();
 
-			var computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+			var defaultView = elem.ownerDocument.defaultView;
+
+			if ( !defaultView ) {
+				return null;
+			}
+
+			var computedStyle = defaultView.getComputedStyle( elem, null );
 
 			if ( computedStyle ) {
 				ret = computedStyle.getPropertyValue( name );
@@ -193,25 +186,49 @@ jQuery.extend({
 		callback.call( elem );
 
 		// Revert the old values
-		for ( var name in options ) {
+		for ( name in options ) {
 			elem.style[ name ] = old[ name ];
 		}
 	}
 });
 
+function getWH( elem, name, extra ) {
+	var which = name === "width" ? cssWidth : cssHeight,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+
+	if ( extra === "border" ) {
+		return val;
+	}
+
+	jQuery.each( which, function() {
+		if ( !extra ) {
+			val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
+		}
+
+		if ( extra === "margin" ) {
+			val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
+
+		} else {
+			val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+		}
+	});
+
+	return val;
+}
+
 if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function(elem){
+	jQuery.expr.filters.hidden = function( elem ) {
 		var width = elem.offsetWidth, height = elem.offsetHeight,
-			 force = /^tr$/i.test( elem.nodeName ); // ticket #4512
+			skip = elem.nodeName.toLowerCase() === "tr";
 
-		return width === 0 && height === 0 && !force ?
+		return width === 0 && height === 0 && !skip ?
 			true :
-				width !== 0 && height !== 0 && !force ?
-					false :
-						jQuery.curCSS(elem, "display") === "none";
+			width > 0 && height > 0 && !skip ?
+				false :
+				jQuery.curCSS(elem, "display") === "none";
 	};
 
-	jQuery.expr.filters.visible = function(elem){
-		return !jQuery.expr.filters.hidden(elem);
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
 	};
 }