X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=c36b6dcc25225f777539fd39d81e8652c4768481;hb=ebad701751689b773afe29d1e3c4532c7810d02a;hp=ddd42b4b2c526f0a75f2f325d6229bbbebbdb0ee;hpb=449e099b97d823ed0252d8821880bc0e471701ea;p=jquery.git

diff --git a/src/css.js b/src/css.js
index ddd42b4..c36b6dc 100644
--- a/src/css.js
+++ b/src/css.js
@@ -5,8 +5,8 @@ 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/,
 
 	// cache check for defaultView.getComputedStyle
 	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
@@ -52,8 +52,9 @@ jQuery.extend({
 				style.zoom = 1;
 
 				// Set the alpha filter to set the opacity
-				style.filter = (style.filter || "").replace( ralpha, "" ) +
-					(parseInt( value ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+				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 ?
@@ -199,17 +200,18 @@ jQuery.extend({
 });
 
 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
-		return ( width === 0 && height === 0 && !force ) ?
+			skip = elem.nodeName.toLowerCase() === "tr";
+
+		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 );
 	};
 }