IE6 will shrink-wrap elements with layout instead of allowing content to flow outside...

[jquery.git] / src / dimensions.js

diff --git a/src/dimensions.js b/src/dimensions.js
index 58c16af..5aafbf4 100644 (file)
--- a/src/dimensions.js
+++ b/src/dimensions.js
@@ -8,14 +8,14 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
        // innerHeight and innerWidth
        jQuery.fn["inner" + name] = function() {
                return this[0] ?
-                       jQuery.css( this[0], type, undefined, false, "padding" ) :
+                       parseFloat( jQuery.css( this[0], type, "padding" ) ) :
                        null;
        };
 
        // outerHeight and outerWidth
        jQuery.fn["outer" + name] = function( margin ) {
                return this[0] ?
-                       jQuery.css( this[0], type, undefined, false, margin ? "margin" : "border" ) :
+                       parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
                        null;
        };
 
@@ -33,7 +33,7 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
                        });
                }
 
-               return ("scrollTo" in elem && elem.document) ? // does it walk and quack like a window?
+               return jQuery.isWindow( elem ) ?
                        // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
                        elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
                        elem.document.body[ "client" + name ] :
@@ -50,7 +50,7 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
                                // Get or set width or height on the element
                                size === undefined ?
                                        // Get width or height on the element
-                                       jQuery.css( elem, type ) :
+                                       parseFloat( jQuery.css( elem, type ) ) :
 
                                        // Set the width or height on the element (default to pixels if value is unitless)
                                        this.css( type, typeof size === "string" ? size : size + "px" );