Skip to content
Permalink
Browse files

Move window/document test to dimensions for consistency

  • Loading branch information...
timmywil
timmywil committed May 25, 2011
1 parent edb2286 commit bdce86dc2edb43267ec5c4b7aab6d1932f294d6f
Showing with 6 additions and 11 deletions.
  1. +0 −5 src/css.js
  2. +6 −6 src/dimensions.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 );
@@ -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;
};

0 comments on commit bdce86d

Please sign in to comment.
You can’t perform that action at this time.