aboutsummaryrefslogtreecommitdiffstats
path: root/src/dimensions.js
diff options
context:
space:
mode:
authorJohn Resig <jeresig@gmail.com>2010-09-17 17:02:03 -0400
committerJohn Resig <jeresig@gmail.com>2010-09-17 17:02:03 -0400
commit2d70dc9c43831232a26dcdd01565df6c596ca977 (patch)
treebf22ef2e3c0d430be10d4462d19e9dfc5a24c472 /src/dimensions.js
parent9dd70a44ad682e7b9aa66680c54a38789a116e27 (diff)
downloadjquery-2d70dc9c43831232a26dcdd01565df6c596ca977.tar.gz
jquery-2d70dc9c43831232a26dcdd01565df6c596ca977.zip
Derp, had parseInt on the brain. Thanks karbassi in 6541eb9d80db42c6ced396fcd198228bff9ec7f1.
Diffstat (limited to 'src/dimensions.js')
-rw-r--r--src/dimensions.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dimensions.js b/src/dimensions.js
index 26c40c3d1..7ca33794c 100644
--- a/src/dimensions.js
+++ b/src/dimensions.js
@@ -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" );