Move window/document test to dimensions for consistency

diff --git a/src/css.js b/src/css.js
index 10d36b765ed1326bd427e882552f28f0b1f86fcc..e3ab270fc61aa52a4b8346adb34d7d977fcece0e 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -170,11 +170,6 @@ jQuery.each(["height", "width"], function( i, name ) {
                get: function( elem, computed, extra ) {
                        var val;
 
-                       // Tests for window/document
-                       if ( !elem.style ) {
-                               return null;
-                       }
-
                        if ( computed ) {
                                if ( elem.offsetWidth !== 0 ) {
                                        val = getWH( elem, name, extra );

diff --git a/src/dimensions.js b/src/dimensions.js
index 1ab92d1dd6b5baaf5b0b46776e6083ddbe355949..8559056b5bd54a523cad63a3b67a752e8d171de4 100644 (file)
--- a/src/dimensions.js
+++ b/src/dimensions.js
@@ -7,17 +7,17 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
 
        // innerHeight and innerWidth
        jQuery.fn["inner" + name] = function() {
-               var ret;
-               return this[0] && !isNaN( ret = parseFloat(jQuery.css( this[0], type, "padding" )) ) ?
-                       ret :
+               var elem = this[0];
+               return elem && elem.style ?
+                       parseFloat( jQuery.css( elem, type, "padding" ) ) :
                        null;
        };
 
        // outerHeight and outerWidth
        jQuery.fn["outer" + name] = function( margin ) {
-               var ret;
-               return this[0] && !isNaN( ret = parseFloat(jQuery.css( this[0], type, margin ? "margin" : "border" )) ) ?
-                       ret :
+               var elem = this[0];
+               return elem && elem.style ?
+                       parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
                        null;
        };