Fix per-property easing. Fixes #9067

This commit is contained in:
Daniel Pihlstrom 2011-05-04 01:07:24 +02:00 committed by timmywil
parent 31268449b9
commit 3d1c27d52e
2 changed files with 18 additions and 7 deletions

9
src/effects.js vendored
View file

@ -191,9 +191,12 @@ jQuery.fn.extend({
}
// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
opt.animatedProperties[name] = jQuery.isArray( val ) ?
val[1]:
opt.specialEasing && opt.specialEasing[name] || opt.easing || 'swing';
if(jQuery.isArray(val)) {
opt.animatedProperties[name] = val[1];
prop[name] = val[0];
} else {
opt.animatedProperties[name] = easing || opt.specialEasing && opt.specialEasing[name] || opt.easing || 'swing';
}
}
if ( opt.overflow != null ) {