X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=5b6b7b9b6bf8cf07936ac1668060083f7035a984;hb=a5f8a1441158b66efb76de1d15f061f87f7bdc17;hp=a16298d6c4f13d2da778c4595258344482f2b152;hpb=6071e939c7025ff7096673c93eaa7e2d78afbb6b;p=jquery.git diff --git a/src/css.js b/src/css.js index a16298d..5b6b7b9 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, @@ -18,8 +18,8 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, jQuery.fn.css = function( name, value ) { return access( this, name, value, true, function( elem, name, value ) { - if (value === undefined) { - return jQuery.css( elem, name ); + if ( value === undefined ) { + return jQuery.curCSS( elem, name ); } if ( typeof value === "number" && !rexclude.test(name) ) { @@ -141,7 +141,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 );