github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-01-23 12:58:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Derp, had parseInt on the brain. Thanks karbassi in 6541eb9d80.

Browse Source
This commit is contained in:
John Resig
2010-09-17 17:02:03 -04:00
parent 9dd70a44ad
commit 2d70dc9c43
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dimensions.js
View File

@@ -8,14 +8,14 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
// innerHeight and innerWidth
jQuery.fn["inner" + name] = function() {
return this[0] ?
parseFloat( jQuery.css( this[0], type, "padding" ), 10 ) :
parseFloat( jQuery.css( this[0], type, "padding" ) ) :
null;
};
// outerHeight and outerWidth
jQuery.fn["outer" + name] = function( margin ) {
return this[0] ?
parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ), 10 ) :
parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
null;
};
@@ -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
parseFloat( jQuery.css( elem, type ), 10 ) :
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" );

2
src/effects.js vendored
View File

@@ -316,7 +316,7 @@ jQuery.fx.prototype = {
return this.elem[ this.prop ];
}
var r = parseFloat( jQuery.css( this.elem, this.prop ), 10 );
var r = parseFloat( jQuery.css( this.elem, this.prop ) );
return r && r > -10000 ? r : 0;
},