deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixes #7912. Make sure .cur() only returns 0 as fallback value when it needs to ("", auto, undefined, null).

Browse source 
This change makes .cur() more .cssHooks friendly. .cur() now returns the unmodified value by
.css() if it isn't a number, number-alike or a value that needs a fallback to 0.
This way fx.start doesn't need to be recalculated for complex values.
This commit is contained in:
louisremi 2011-02-17 17:26:23 +01:00 • committed by Anton M
parent b9f5e2b974
commit 85d9343271
2 changed files with 43 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/effects.js vendored
View file

@ -185,7 +185,7 @@ jQuery.fn.extend({
} else {
var parts = rfxnum.exec(val),
start = e.cur() || 0;
start = e.cur();
if ( parts ) {
var end = parseFloat( parts[2] ),
@ -336,8 +336,12 @@ jQuery.fx.prototype = {
return this.elem[ this.prop ];
}
var r = parseFloat( jQuery.css( this.elem, this.prop ) );
return r || 0;
var parsed,
r = jQuery.css( this.elem, this.prop );
// Empty strings, null, undefined and "auto" are converted to 0,
// complex values such as "rotate(1rad)" are returned as is,
// simple values such as "10px" are parsed to Float.
return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
},
// Start an animation from one number to another