Make sure that calling .width(num) or .height(num) on an empty set returns the empty...

[jquery.git] / src / css.js

diff --git a/src/css.js b/src/css.js
index a16298d..5b6b7b9 100644 (file)
--- 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 );