]> source.dussan.org Git - jquery.git/commitdiff
This should repair the unit
authorCorey Frang <gnarf@gnarf.net>
Wed, 25 Jul 2012 20:36:21 +0000 (15:36 -0500)
committerCorey Frang <gnarf@gnarf.net>
Wed, 25 Jul 2012 20:36:21 +0000 (15:36 -0500)
src/sizzle
test/unit/effects.js

index 4fc4b92a1d1037b70162faf19860c2aac2ae5622..e4d50dd01f7573e205606746b32924281db379f0 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4fc4b92a1d1037b70162faf19860c2aac2ae5622
+Subproject commit e4d50dd01f7573e205606746b32924281db379f0
index a3550588494e9efc5a40ac35881b41cabea355a8..6d200b534d698ea7f01a6cbe4eb1cb89823192d7 100644 (file)
@@ -1405,29 +1405,27 @@ asyncTest( "jQuery.Animation( object, props, opts )", 4, function() {
 
 asyncTest( "Animate Option: step: function( percent, tween )", 1, function() {
        var counter = {};
-       // if the animation loop is already running when we start this test, it WILL fail
-       // going to try delaying 100ms to make sure any potential leftover animations are done
-       setTimeout( function() {
-               jQuery( "#foo" ).animate({
-                       prop1: 1,
-                       prop2: 2,
-                       prop3: 3
-               }, {
-                       duration: 1,
-                       step: function( value, tween ) {
-                               var calls = counter[ tween.prop ] = counter[ tween.prop ] || [];
-                               calls.push( value );
-                       }
-               }).queue( function( next ) {
-                       deepEqual( counter, {
-                               prop1: [0, 1],
-                               prop2: [0, 2],
-                               prop3: [0, 3]
-                       }, "Step function was called once at 0% and once at 100% for each property");
-                       next();
-                       start();
-               });
-       }, 100 );
+       jQuery( "#foo" ).animate({
+               prop1: 1,
+               prop2: 2,
+               prop3: 3
+       }, {
+               duration: 1,
+               step: function( value, tween ) {
+                       var calls = counter[ tween.prop ] = counter[ tween.prop ] || [];
+                       // in case this is called multiple times for either, lets store it in
+                       // 0 or 1 in the array
+                       calls[ value === 0 ? 0 : 1 ] = value;
+               }
+       }).queue( function( next ) {
+               deepEqual( counter, {
+                       prop1: [0, 1],
+                       prop2: [0, 2],
+                       prop3: [0, 3]
+               }, "Step function was called once at 0% and once at 100% for each property");
+               next();
+               start();
+       });
 });
 
 asyncTest( "Animate callbacks have correct context", 2, function() {