deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move window/document test to dimensions for consistency

Browse source
This commit is contained in:
timmywil 2011-05-25 19:59:29 -04:00
parent edb2286544
commit bdce86dc2e
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/css.js
View file

@ -170,11 +170,6 @@ jQuery.each(["height", "width"], function( i, name ) {
get: function( elem, computed, extra ) { get: function( elem, computed, extra ) {
var val; var val;
// Tests for window/document
if ( !elem.style ) {
return null;
}
if ( computed ) { if ( computed ) {
if ( elem.offsetWidth !== 0 ) { if ( elem.offsetWidth !== 0 ) {
val = getWH( elem, name, extra ); val = getWH( elem, name, extra );

12
src/dimensions.js
View file

@ -7,17 +7,17 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
// innerHeight and innerWidth // innerHeight and innerWidth
jQuery.fn["inner" + name] = function() { jQuery.fn["inner" + name] = function() {
var ret; var elem = this[0];
return this[0] && !isNaN( ret = parseFloat(jQuery.css( this[0], type, "padding" )) ) ? return elem && elem.style ?
ret : parseFloat( jQuery.css( elem, type, "padding" ) ) :
null; null;
}; };
// outerHeight and outerWidth // outerHeight and outerWidth
jQuery.fn["outer" + name] = function( margin ) { jQuery.fn["outer" + name] = function( margin ) {
var ret; var elem = this[0];
return this[0] && !isNaN( ret = parseFloat(jQuery.css( this[0], type, margin ? "margin" : "border" )) ) ? return elem && elem.style ?
ret : parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
null; null;
}; };