X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcss.js;h=c36b6dcc25225f777539fd39d81e8652c4768481;hb=93fdbeb963a9c350f807818c7cc99982942a92f3;hp=ceed4e60b83c3e82f9f0244950f529be6007a7be;hpb=64e4a879f9f92053ac4d58a3fffc0bbff6900b6e;p=jquery.git diff --git a/src/css.js b/src/css.js index ceed4e6..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, @@ -53,7 +53,7 @@ jQuery.extend({ // Set the alpha filter to set the opacity var opacity = parseInt( value, 10 ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"; - filter = style.filter || jQuery.curCSS( elem, 'filter' ) || "" + var filter = style.filter || jQuery.curCSS( elem, 'filter' ) || ""; style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity; } @@ -200,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 ); }; }