Massive FX rewrite. Full list of changes:
- You can now animate non-px values (em and %, for example)
- You can animate things things that previously broke (like font-size)
- You can now write fx plugins (to add in the ability to animate colors, for example)
- Advanced queueing controls were added (.queue(), .dequeue(), and {queue:false})
- Step was re-tooled to work with the new fx plugin scheme
- Added the ability to do relative animations
- Made it so that you can do simultaneous animations on a single element
- A complete refactoring of jQuery.fx, improving naming, and usability
This commit is contained in:
John Resig
parent
3abf3125cb
commit
902554a38d
270
src/fx/fx.js
270
src/fx/fx.js
|
|
@ -66,10 +66,11 @@ jQuery.fn.extend({
|
|||
},
|
||||
|
||||
animate: function( prop, speed, easing, callback ) {
|
||||
return this.queue(function(){
|
||||
var hidden = jQuery(this).is(":hidden"),
|
||||
opt = jQuery.speed(speed, easing, callback),
|
||||
self = this;
|
||||
var opt = jQuery.speed(speed, easing, callback);
|
||||
|
||||
return this[ opt.queue === false ? "each" : "queue" ](function(){
|
||||
opt = jQuery.extend({}, opt);
|
||||
var hidden = jQuery(this).is(":hidden"), self = this;
|
||||
|
||||
for ( var p in prop ) {
|
||||
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
|
||||
|
|
@ -87,14 +88,36 @@ jQuery.fn.extend({
|
|||
if ( opt.overflow != null )
|
||||
this.style.overflow = "hidden";
|
||||
|
||||
this.curAnim = jQuery.extend({}, prop);
|
||||
opt.curAnim = jQuery.extend({}, prop);
|
||||
|
||||
jQuery.each( prop, function(name, val){
|
||||
var e = new jQuery.fx( self, opt, name );
|
||||
if ( val.constructor == Number )
|
||||
e.custom( e.cur() || 0, val );
|
||||
else
|
||||
|
||||
if ( /toggle|show|hide/.test(val) )
|
||||
e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
|
||||
else {
|
||||
var parts = val.toString().match(/^([+-]?)([\d.]+)(.*)$/),
|
||||
start = e.cur(true) || 0;
|
||||
|
||||
if ( parts ) {
|
||||
end = parseFloat(parts[2]),
|
||||
unit = parts[3] || "px";
|
||||
|
||||
// We need to compute starting value
|
||||
if ( unit != "px" ) {
|
||||
self.style[ name ] = end + unit;
|
||||
start = (end / e.cur(true)) * start;
|
||||
self.style[ name ] = start + unit;
|
||||
}
|
||||
|
||||
// If a +/- token was provided, we're doing a relative animation
|
||||
if ( parts[1] )
|
||||
end = ((parts[1] == "-" ? -1 : 1) * end) + start;
|
||||
|
||||
e.custom( start, end, unit );
|
||||
} else
|
||||
e.custom( start, val, "" );
|
||||
}
|
||||
});
|
||||
|
||||
// For JS strict compliance
|
||||
|
|
@ -108,17 +131,31 @@ jQuery.fn.extend({
|
|||
type = "fx";
|
||||
}
|
||||
|
||||
if ( !arguments.length )
|
||||
return queue( this[0], type );
|
||||
|
||||
return this.each(function(){
|
||||
if ( !this.queue )
|
||||
this.queue = {};
|
||||
if ( fn.constructor == Array )
|
||||
queue(this, type, fn);
|
||||
else {
|
||||
queue(this, type).push( fn );
|
||||
|
||||
if ( !this.queue[type] )
|
||||
this.queue[type] = [];
|
||||
|
||||
this.queue[type].push( fn );
|
||||
|
||||
if ( this.queue[type].length == 1 )
|
||||
if ( queue(this, type).length == 1 )
|
||||
fn.apply(this);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
dequeue: function(type){
|
||||
type = type || "fx";
|
||||
|
||||
return this.each(function(){
|
||||
var q = queue(this, type);
|
||||
|
||||
q.shift();
|
||||
|
||||
if ( q.length )
|
||||
q[0].apply( this );
|
||||
});
|
||||
},
|
||||
|
||||
|
|
@ -134,6 +171,22 @@ jQuery.fn.extend({
|
|||
|
||||
});
|
||||
|
||||
function queue( elem, type, array ) {
|
||||
if ( !elem )
|
||||
return;
|
||||
|
||||
if ( !elem.queue )
|
||||
elem.queue = {};
|
||||
|
||||
if ( !elem.queue[type] )
|
||||
elem.queue[type] = [];
|
||||
|
||||
if ( array )
|
||||
elem.queue[type] = jQuery.makeArray(array);
|
||||
|
||||
return elem.queue[type];
|
||||
}
|
||||
|
||||
jQuery.extend({
|
||||
|
||||
speed: function(speed, easing, fn) {
|
||||
|
|
@ -151,7 +204,7 @@ jQuery.extend({
|
|||
// Queueing
|
||||
opt.old = opt.complete;
|
||||
opt.complete = function(){
|
||||
jQuery.dequeue(this, "fx");
|
||||
jQuery(this).dequeue();
|
||||
if ( jQuery.isFunction( opt.old ) )
|
||||
opt.old.apply( this );
|
||||
};
|
||||
|
|
@ -168,71 +221,58 @@ jQuery.extend({
|
|||
}
|
||||
},
|
||||
|
||||
queue: {},
|
||||
|
||||
dequeue: function(elem,type){
|
||||
type = type || "fx";
|
||||
|
||||
if ( elem.queue && elem.queue[type] ) {
|
||||
// Remove self
|
||||
elem.queue[type].shift();
|
||||
|
||||
// Get next function
|
||||
var f = elem.queue[type][0];
|
||||
|
||||
if ( f ) f.apply( elem );
|
||||
}
|
||||
},
|
||||
|
||||
timers: [],
|
||||
|
||||
fx: function( elem, options, prop ){
|
||||
this.options = options;
|
||||
this.elem = elem;
|
||||
this.prop = prop;
|
||||
|
||||
var z = this, y = elem.style,
|
||||
isprop = elem[prop] != null && y[prop] == null;
|
||||
if ( !options.orig )
|
||||
options.orig = {};
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
jQuery.fx.prototype = {
|
||||
|
||||
// Simple function for setting a style value
|
||||
z.a = function(){
|
||||
if ( options.step )
|
||||
options.step.apply( elem, [ z.now ] );
|
||||
update: function(){
|
||||
if ( this.options.step )
|
||||
this.options.step.apply( this.elem, [ this.now, this ] );
|
||||
|
||||
if ( prop == "opacity" )
|
||||
jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
|
||||
else {
|
||||
if ( isprop )
|
||||
elem[prop] = parseInt(z.now);
|
||||
else
|
||||
y[prop] = parseInt(z.now) + "px";
|
||||
(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
|
||||
|
||||
// Set display property to block for height/width animations
|
||||
if ( prop == "height" || prop == "width" )
|
||||
y.display = "block";
|
||||
}
|
||||
};
|
||||
|
||||
// Figure out the maximum number to run to
|
||||
z.max = function(){
|
||||
return parseFloat( jQuery.css(elem,prop) );
|
||||
};
|
||||
if ( this.prop == "height" || this.prop == "width" )
|
||||
this.elem.style.display = "block";
|
||||
},
|
||||
|
||||
// Get the current size
|
||||
z.cur = function(){
|
||||
if ( isprop ) return elem[prop];
|
||||
var r = parseFloat( jQuery.curCSS(elem, prop) );
|
||||
return r && r > -10000 ? r : z.max();
|
||||
};
|
||||
cur: function(force){
|
||||
if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
|
||||
return this.elem[ this.prop ];
|
||||
|
||||
var r = parseFloat(jQuery.curCSS(this.elem, this.prop, force));
|
||||
return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
|
||||
},
|
||||
|
||||
// Start an animation from one number to another
|
||||
z.custom = function(from,to){
|
||||
z.startTime = (new Date()).getTime();
|
||||
z.now = from;
|
||||
z.a();
|
||||
custom: function(from, to, unit){
|
||||
this.startTime = (new Date()).getTime();
|
||||
this.start = from;
|
||||
this.end = to;
|
||||
this.unit = unit || this.unit || "px";
|
||||
this.now = this.start;
|
||||
this.pos = this.state = 0;
|
||||
this.update();
|
||||
|
||||
var self = this;
|
||||
function t(){
|
||||
return z.step(from, to);
|
||||
return self.step();
|
||||
}
|
||||
|
||||
t.elem = elem;
|
||||
t.elem = this.elem;
|
||||
|
||||
jQuery.timers.push(t);
|
||||
|
||||
|
|
@ -248,98 +288,110 @@ jQuery.extend({
|
|||
clearInterval( timer );
|
||||
}, 13);
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
// Simple 'show' function
|
||||
z.show = function(){
|
||||
if ( !elem.orig ) elem.orig = {};
|
||||
|
||||
show: function(){
|
||||
// Remember where we started, so that we can go back to it later
|
||||
elem.orig[prop] = jQuery.attr( elem.style, prop );
|
||||
|
||||
options.show = true;
|
||||
this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
|
||||
this.options.show = true;
|
||||
|
||||
// Begin the animation
|
||||
z.custom(0, this.cur());
|
||||
this.custom(0, this.cur());
|
||||
|
||||
// Make sure that we start at a small width/height to avoid any
|
||||
// flash of content
|
||||
if ( prop != "opacity" )
|
||||
y[prop] = "1px";
|
||||
if ( this.prop == "width" || this.prop == "height" )
|
||||
this.elem.style[this.prop] = "1px";
|
||||
|
||||
// Start by showing the element
|
||||
jQuery(elem).show();
|
||||
};
|
||||
jQuery(this.elem).show();
|
||||
},
|
||||
|
||||
// Simple 'hide' function
|
||||
z.hide = function(){
|
||||
if ( !elem.orig ) elem.orig = {};
|
||||
|
||||
hide: function(){
|
||||
// Remember where we started, so that we can go back to it later
|
||||
elem.orig[prop] = jQuery.attr( elem.style, prop );
|
||||
|
||||
options.hide = true;
|
||||
this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
|
||||
this.options.hide = true;
|
||||
|
||||
// Begin the animation
|
||||
z.custom(this.cur(), 0);
|
||||
};
|
||||
this.custom(this.cur(), 0);
|
||||
},
|
||||
|
||||
// Each step of an animation
|
||||
z.step = function(firstNum, lastNum){
|
||||
step: function(){
|
||||
var t = (new Date()).getTime();
|
||||
|
||||
if (t > options.duration + z.startTime) {
|
||||
z.now = lastNum;
|
||||
z.a();
|
||||
if ( t > this.options.duration + this.startTime ) {
|
||||
this.now = this.end;
|
||||
this.pos = this.state = 1;
|
||||
this.update();
|
||||
|
||||
if (elem.curAnim) elem.curAnim[ prop ] = true;
|
||||
this.options.curAnim[ this.prop ] = true;
|
||||
|
||||
var done = true;
|
||||
for ( var i in elem.curAnim )
|
||||
if ( elem.curAnim[i] !== true )
|
||||
for ( var i in this.options.curAnim )
|
||||
if ( this.options.curAnim[i] !== true )
|
||||
done = false;
|
||||
|
||||
if ( done ) {
|
||||
if ( options.display != null ) {
|
||||
if ( this.options.display != null ) {
|
||||
// Reset the overflow
|
||||
y.overflow = options.overflow;
|
||||
this.elem.style.overflow = this.options.overflow;
|
||||
|
||||
// Reset the display
|
||||
y.display = options.display;
|
||||
if ( jQuery.css(elem, "display") == "none" )
|
||||
y.display = "block";
|
||||
this.elem.style.display = this.options.display;
|
||||
if ( jQuery.css(this.elem, "display") == "none" )
|
||||
this.elem.style.display = "block";
|
||||
}
|
||||
|
||||
// Hide the element if the "hide" operation was done
|
||||
if ( options.hide )
|
||||
y.display = "none";
|
||||
if ( this.options.hide )
|
||||
this.elem.style.display = "none";
|
||||
|
||||
// Reset the properties, if the item has been hidden or shown
|
||||
if ( options.hide || options.show )
|
||||
for ( var p in elem.curAnim )
|
||||
jQuery.attr(y, p, elem.orig[p]);
|
||||
if ( this.options.hide || this.options.show )
|
||||
for ( var p in this.options.curAnim )
|
||||
jQuery.attr(this.elem.style, p, this.options.orig[p]);
|
||||
}
|
||||
|
||||
// If a callback was provided, execute it
|
||||
if ( done && jQuery.isFunction( options.complete ) )
|
||||
if ( done && jQuery.isFunction( this.options.complete ) )
|
||||
// Execute the complete function
|
||||
options.complete.apply( elem );
|
||||
this.options.complete.apply( this.elem );
|
||||
|
||||
return false;
|
||||
} else {
|
||||
var n = t - this.startTime;
|
||||
// Figure out where in the animation we are and set the number
|
||||
var p = n / options.duration;
|
||||
this.state = n / this.options.duration;
|
||||
|
||||
// Perform the easing function, defaults to swing
|
||||
z.now = jQuery.easing[options.easing || (jQuery.easing.swing ? "swing" : "linear")](p, n, firstNum, (lastNum-firstNum), options.duration);
|
||||
this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
|
||||
this.now = this.start + ((this.end - this.start) * this.pos);
|
||||
|
||||
// Perform the next step of the animation
|
||||
z.a();
|
||||
this.update();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
jQuery.fx.step = {
|
||||
scrollLeft: function(fx){
|
||||
fx.elem.scrollLeft = fx.now;
|
||||
},
|
||||
|
||||
scrollTop: function(fx){
|
||||
fx.elem.scrollTop = fx.now;
|
||||
},
|
||||
|
||||
opacity: function(fx){
|
||||
jQuery.attr(fx.elem.style, "opacity", fx.now);
|
||||
},
|
||||
|
||||
_default: function(fx){
|
||||
fx.elem.style[ fx.prop ] = fx.now + fx.unit;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue