diff options
| author | John Resig <jeresig@gmail.com> | 2010-09-17 17:02:03 -0400 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2010-09-17 17:02:03 -0400 |
| commit | 2d70dc9c43831232a26dcdd01565df6c596ca977 (patch) | |
| tree | bf22ef2e3c0d430be10d4462d19e9dfc5a24c472 /src | |
| parent | 9dd70a44ad682e7b9aa66680c54a38789a116e27 (diff) | |
| download | jquery-2d70dc9c43831232a26dcdd01565df6c596ca977.tar.gz jquery-2d70dc9c43831232a26dcdd01565df6c596ca977.zip | |
Derp, had parseInt on the brain. Thanks karbassi in 6541eb9d80db42c6ced396fcd198228bff9ec7f1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dimensions.js | 6 | ||||
| -rw-r--r-- | src/effects.js | 2 |
2 files changed, 4 insertions, 4 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" ); diff --git a/src/effects.js b/src/effects.js index 9db341a3b..d3ac99a45 100644 --- a/src/effects.js +++ b/src/effects.js @@ -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; }, |