deac/jquery
1
0
Fork 0
Code Issues Pull requests 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
Show stats 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 // innerHeight and innerWidth
jQuery.fn["inner" + name] = function() { jQuery.fn["inner" + name] = function() {
return this[0] ? return this[0] ?
parseFloat( jQuery.css( this[0], type, "padding" ), 10 ) : parseFloat( jQuery.css( this[0], type, "padding" ) ) :
null; null;
}; };
// outerHeight and outerWidth // outerHeight and outerWidth
jQuery.fn["outer" + name] = function( margin ) { jQuery.fn["outer" + name] = function( margin ) {
return this[0] ? return this[0] ?
parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ), 10 ) : parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
null; null;
}; };
@ -50,7 +50,7 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
// Get or set width or height on the element // Get or set width or height on the element
size === undefined ? size === undefined ?
// Get width or height on the element // 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) // Set the width or height on the element (default to pixels if value is unitless)
this.css( type, typeof size === "string" ? size : size + "px" ); 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 ]; 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; return r && r > -10000 ? r : 0;
}, },