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

Convert relative animations to use -= and += (instead of just - and +, which conflicted with normal absolute animations). (Fixes bug #1607) Also fixed a bug in queue.

Browse source
This commit is contained in:
John Resig 2007-09-15 02:40:42 +00:00
parent 9c2c47d7c0
commit df246df2da
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/fx.js
View file

@ -96,7 +96,7 @@ jQuery.fn.extend({
if ( /toggle|show|hide/.test(val) ) if ( /toggle|show|hide/.test(val) )
e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop ); e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
else { else {
var parts = val.toString().match(/^([+-]?)([\d.]+)(.*)$/), var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
start = e.cur(true) || 0; start = e.cur(true) || 0;
if ( parts ) { if ( parts ) {
@ -110,12 +110,9 @@ jQuery.fn.extend({
self.style[ name ] = start + unit; self.style[ name ] = start + unit;
} }
// If a +/- token was provided, we're doing a relative animation // If a +=/-= token was provided, we're doing a relative animation
if ( parts[1] ) if ( parts[1] )
end = ((parts[1] == "-" ? -1 : 1) * end) + start; end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
// Absolutely position numbers
if( typeof val == "number") end = val;
e.custom( start, end, unit ); e.custom( start, end, unit );
} else } else
@ -134,7 +131,7 @@ jQuery.fn.extend({
type = "fx"; type = "fx";
} }
if ( !type || typeof type == "string" ) if ( !type || (typeof type == "string" && !fn) )
return queue( this[0], type ); return queue( this[0], type );
return this.each(function(){ return this.each(function(){