diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/dimensions.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/dimensions.js b/src/dimensions.js index d54776536..7df0d5ddf 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -8,16 +8,20 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { // innerHeight and innerWidth jQuery.fn[ "inner" + name ] = function() { var elem = this[0]; - return elem && elem.style ? + return elem ? + elem.style ? parseFloat( jQuery.css( elem, type, "padding" ) ) : + this[ type ]() : null; }; // outerHeight and outerWidth jQuery.fn[ "outer" + name ] = function( margin ) { var elem = this[0]; - return elem && elem.style ? + return elem ? + elem.style ? parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) : + this[ type ]() : null; }; |