github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-01-24 09:08:04 -05:00
Code Issues Packages Projects 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
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 ) {
var val;
// Tests for window/document
if ( !elem.style ) {
return null;
}
if ( computed ) {
if ( elem.offsetWidth !== 0 ) {
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
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;
};