diff options
| author | jaubourg <j@ubourg.net> | 2011-09-12 17:37:41 +0200 |
|---|---|---|
| committer | timmywil <timmywillisn@gmail.com> | 2011-09-19 15:42:30 -0400 |
| commit | 4092e3d2754e3847cd3159edb23184d4cfd4cf03 (patch) | |
| tree | 79a0a58644939da906ec750281488beee862a41d /src/queue.js | |
| parent | 1878885fb7a09b65d95980a9b7dce2df2944e4f9 (diff) | |
| download | jquery-4092e3d2754e3847cd3159edb23184d4cfd4cf03.tar.gz jquery-4092e3d2754e3847cd3159edb23184d4cfd4cf03.zip | |
$.Callbacks, $.Topic and notify/progress on $.Deferred.
Diffstat (limited to 'src/queue.js')
| -rw-r--r-- | src/queue.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/queue.js b/src/queue.js index cd6aeb26b..0c678064e 100644 --- a/src/queue.js +++ b/src/queue.js @@ -14,7 +14,7 @@ function handleQueueMarkDefer( elem, type, src ) { if ( !jQuery._data( elem, queueDataKey ) && !jQuery._data( elem, markDataKey ) ) { jQuery.removeData( elem, deferDataKey, true ); - defer.resolve(); + defer.fire(); } }, 0 ); } @@ -160,9 +160,9 @@ jQuery.fn.extend({ if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) || ( jQuery.data( elements[ i ], queueDataKey, undefined, true ) || jQuery.data( elements[ i ], markDataKey, undefined, true ) ) && - jQuery.data( elements[ i ], deferDataKey, jQuery._Deferred(), true ) )) { + jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) { count++; - tmp.done( resolve ); + tmp.add( resolve ); } } resolve(); |