From 65df32dc21dc315fe0dcccdcf7d07884f4794ccd Mon Sep 17 00:00:00 2001 From: Mike Sherov Date: Tue, 15 Jan 2013 23:09:35 -0500 Subject: Fix #13183: Wrong animation initial value calc. Close gh-1136. --- src/css.js | 2 +- src/effects.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/css.js b/src/css.js index 7ddce0a04..03437c2a7 100644 --- a/src/css.js +++ b/src/css.js @@ -265,7 +265,7 @@ jQuery.extend({ } // Return, converting to number if forced or a qualifier was provided and val looks numeric - if ( extra ) { + if ( extra === "" || extra ) { num = parseFloat( val ); return extra === true || jQuery.isNumeric( num ) ? num || 0 : val; } diff --git a/src/effects.js b/src/effects.js index f72521024..189f65ce5 100644 --- a/src/effects.js +++ b/src/effects.js @@ -427,11 +427,11 @@ Tween.propHooks = { return tween.elem[ tween.prop ]; } - // passing a non empty string as a 3rd parameter to .css will automatically + // passing an empty string as a 3rd parameter to .css will automatically // attempt a parseFloat and fallback to a string if the parse fails // so, simple values such as "10px" are parsed to Float. // complex values such as "rotate(1rad)" are returned as is. - result = jQuery.css( tween.elem, tween.prop, "auto" ); + result = jQuery.css( tween.elem, tween.prop, "" ); // Empty strings, null, undefined and "auto" are converted to 0. return !result || result === "auto" ? 0 : result; }, -- cgit v1.2.3