deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery

Browse source
This commit is contained in:
jeresig 2011-01-20 11:58:52 -05:00
commit ea5ce8c2a9
5 changed files with 79 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/core.js
View file

@ -399,7 +399,7 @@ jQuery.extend({
}
// If there are functions bound, to execute
readyList.fire( document , [ jQuery ] );
readyList.resolveWith( document , [ jQuery ] );
// Trigger any bound ready events
if ( jQuery.fn.trigger ) {
@ -837,7 +837,7 @@ jQuery.extend({
}
if ( _fired ) {
deferred.fire( _fired[ 0 ] , _fired[ 1 ] );
deferred.resolveWith( _fired[ 0 ] , _fired[ 1 ] );
}
}
@ -845,7 +845,7 @@ jQuery.extend({
},
// resolve with given context and args
fire: function( context , args ) {
resolveWith: function( context , args ) {
if ( ! cancelled && ! fired && ! firing ) {
firing = 1;
@ -865,7 +865,7 @@ jQuery.extend({
// resolve with this as context and given arguments
resolve: function() {
deferred.fire( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments );
deferred.resolveWith( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments );
return this;
},
@ -901,7 +901,7 @@ jQuery.extend({
return this;
},
fail: failDeferred.done,
fireReject: failDeferred.fire,
rejectWith: failDeferred.resolveWith,
reject: failDeferred.resolve,
isRejected: failDeferred.isResolved,
// Get a promise for this deferred
@ -954,10 +954,10 @@ jQuery.extend({
args = arguments;
resolveArray[ index ] = args.length > 1 ? slice.call( args , 0 ) : value;
if( ! --length ) {
deferred.fire( promise, resolveArray );
deferred.resolveWith( promise, resolveArray );
}
}).fail( function() {
deferred.fireReject( promise, arguments );
deferred.rejectWith( promise, arguments );
});
return !deferred.isRejected();
});