diff options
| author | gnarf <gnarf@gnarf.net> | 2011-06-21 01:11:46 -0500 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-06-21 01:18:19 -0500 |
| commit | ab627e03a6a37cbf3291e9600f5482bd50991360 (patch) | |
| tree | cda0933741895ef198be19813cb45168889ea78f /ui/jquery.effects.shake.js | |
| parent | 65a6c46e5568c43a9df9505e23da6a766814557e (diff) | |
| download | jquery-ui-ab627e03a6a37cbf3291e9600f5482bd50991360.tar.gz jquery-ui-ab627e03a6a37cbf3291e9600f5482bd50991360.zip | |
Effects.*: DRY the complete callback execution into the 'done' callback passed into an effect
Diffstat (limited to 'ui/jquery.effects.shake.js')
| -rw-r--r-- | ui/jquery.effects.shake.js | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ui/jquery.effects.shake.js b/ui/jquery.effects.shake.js index 311edced0..7d83a9bb8 100644 --- a/ui/jquery.effects.shake.js +++ b/ui/jquery.effects.shake.js @@ -12,7 +12,7 @@ */ (function( $, undefined ) { -$.effects.effect.shake = function( o, next ) { +$.effects.effect.shake = function( o, done ) { var el = $( this ), props = [ "position", "top", "bottom", "left", "right", "height", "width" ], @@ -53,16 +53,13 @@ $.effects.effect.shake = function( o, next ) { el .animate( animation1, speed, o.easing ) .animate( animation, speed / 2, o.easing ) - .queue( function( next ) { + .queue(function() { if ( mode === "hide" ) { el.hide(); } $.effects.restore( el, props ); $.effects.removeWrapper( el ); - if ( $.isFunction( o.complete ) ) { - o.complete.apply( this, arguments ); - } - next(); + done(); }); // inject all the animations we just queued to be first in line (after "inprogress") @@ -70,7 +67,7 @@ $.effects.effect.shake = function( o, next ) { queue.splice.apply( queue, [ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) ); } - next(); + el.dequeue(); }; |