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

Added support for per-property easing

Browse source
This commit is contained in:
James Padolsey 2009-12-07 00:37:34 +08:00 • committed by John Resig
parent 62a34450c0
commit 93fdbeb963
2 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/fx.js
View file

@ -128,6 +128,11 @@ jQuery.fn.extend({
// Make sure that nothing sneaks out
opt.overflow = this.style.overflow;
}
if ( jQuery.isArray( prop[p] ) ) {
// Create (if needed) and add to specialEasing
(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
prop[p] = prop[p][0];
}
}
if ( opt.overflow != null ) {
@ -387,7 +392,9 @@ jQuery.fx.prototype = {
this.state = n / this.options.duration;
// Perform the easing function, defaults to swing
this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
this.pos = jQuery.easing[specialEasing || defaultEasing](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