Skip to content

Commit

Permalink
a few more bytes
Browse files Browse the repository at this point in the history
Conflicts:

	src/effects.js
  • Loading branch information
gnarf committed Apr 20, 2012
1 parent b0d1f3d commit ec70f22
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/effects.js
Expand Up @@ -71,13 +71,14 @@ function Animation( elem, properties, options ) {
index = 0,
tweenerIndex = 0,
length = preFilters.length,
deferred = jQuery.Deferred().always(function() {
finished = jQuery.Callbacks("once memory"),
deferred = jQuery.Deferred().always(function( ended ) {
// remove cirular reference
delete animation.tick;
}),
finished = deferred.then( undefined, function( ended ) {
if ( ended ) {
return jQuery.Deferred().resolveWith( this, [] );

if ( deferred.isResolved() || ended ) {
// fire callbacks
finished.fireWith( this );
}
}),
animation = {
Expand All @@ -88,7 +89,7 @@ function Animation( elem, properties, options ) {
opts: jQuery.extend( {}, options ),
startTime: fxNow || createFxNow(),
duration: options.duration,
finish: finished.done,
finish: finished.add,
tweens: [],
createTween: function( prop, end, easing ) {
var tween = jQuery.Tween( elem, animation.opts, prop, end,
Expand Down

0 comments on commit ec70f22

Please sign in to comment.