Permalink
Browse files

Fix per-property easing. Fixes #9067

  • Loading branch information...
sciolist authored and timmywil committed May 3, 2011
1 parent 3126844 commit 3d1c27d52ec667cea5735366a41f65344ab17a5e
Showing with 18 additions and 7 deletions.
  1. +6 −3 src/effects.js
  2. +12 −4 test/unit/effects.js
@@ -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 ) {
@@ -923,9 +923,10 @@ test("jQuery.show('fast') doesn't clear radio buttons (bug #1095)", function ()

test("animate with per-property easing", function(){

expect(3);
expect(5);
stop();

var data = {a:0,b:0,c:0};
var _test1_called = false;
var _test2_called = false;
var _default_test_called = false;
@@ -934,23 +935,30 @@ test("animate with per-property easing", function(){
_test1_called = true;
};

jQuery.easing["_test2"] = function() {
jQuery.easing["_test2"] = function(p) {
_test2_called = true;
return p;
};

jQuery.easing["_default_test"] = function() {
jQuery.easing["_default_test"] = function(p) {
_default_test_called = true;
return p;
};

jQuery({a:0,b:0,c:0}).animate({
jQuery(data).animate({
a: [100, "_test1"],
b: [100, "_test2"],
c: 100
}, 400, "_default_test", function(){
start();

ok(_test1_called, "Easing function (1) called");

ok(_test2_called, "Easing function (2) called");
ok(data.b == 100, "Easing function (2) assigned correct value");

ok(_default_test_called, "Easing function (_default) called");
ok(data.c == 100, "Easing function (_default) assigned correct value");
});

});

0 comments on commit 3d1c27d

Please sign in to comment.