git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/scottjehl/jquery into scottjehl-master
[jquery.git]
/
src
/
core.js
diff --git
a/src/core.js
b/src/core.js
index
6d333c5
..
236f84d
100644
(file)
--- a/
src/core.js
+++ b/
src/core.js
@@
-399,7
+399,7
@@
jQuery.extend({
}
// If there are functions bound, to execute
}
// If there are functions bound, to execute
- readyList.fire( document , [ jQuery ] );
+ readyList.resolveWith( document , [ jQuery ] );
// Trigger any bound ready events
if ( jQuery.fn.trigger ) {
// Trigger any bound ready events
if ( jQuery.fn.trigger ) {
@@
-837,7
+837,7
@@
jQuery.extend({
}
if ( _fired ) {
}
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
},
// resolve with given context and args
- fire: function( context , args ) {
+ resolveWith: function( context , args ) {
if ( ! cancelled && ! fired && ! firing ) {
firing = 1;
if ( ! cancelled && ! fired && ! firing ) {
firing = 1;
@@
-865,7
+865,7
@@
jQuery.extend({
// resolve with this as context and given arguments
resolve: function() {
// 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;
},
return this;
},
@@
-901,7
+901,7
@@
jQuery.extend({
return this;
},
fail: failDeferred.done,
return this;
},
fail: failDeferred.done,
- fireReject: failDeferred.fire,
+ rejectWith: failDeferred.resolveWith,
reject: failDeferred.resolve,
isRejected: failDeferred.isResolved,
// Get a promise for this deferred
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 ) {
args = arguments;
resolveArray[ index ] = args.length > 1 ? slice.call( args , 0 ) : value;
if( ! --length ) {
- deferred.fire( promise, resolveArray );
+ deferred.resolveWith( promise, resolveArray );
}
}).fail( function() {
}
}).fail( function() {
- deferred.fireReject( promise, arguments );
+ deferred.rejectWith( promise, arguments );
});
return !deferred.isRejected();
});
});
return !deferred.isRejected();
});