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

"then" renamed "complete" and new "then" method defined using "complete" and "fail" internally. The API is still symetrical (complete/fail), still promotes AOP but is also now Promise/A compliant. Changed unit tests and ajax module accordingly.

Browse source
This commit is contained in:
jaubourg 2011-01-05 04:29:30 +01:00
parent 4ab94a578e
commit cbf591152c
3 changed files with 40 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ajax.js
View file

@ -496,9 +496,9 @@ jQuery.extend({
// Attach deferreds
deferred.promise( jXHR );
jXHR.success = jXHR.then;
jXHR.success = jXHR.complete;
jXHR.error = jXHR.fail;
jXHR.complete = completeDeferred.then;
jXHR.complete = completeDeferred.complete;
// Remove hash character (#7531: and string promotion)
s.url = ( "" + s.url ).replace( rhash , "" );

44
src/core.js
View file

@ -258,7 +258,7 @@ jQuery.fn = jQuery.prototype = {
jQuery.bindReady();
// Change ready & apply
return ( jQuery.fn.ready = readyList.then ).apply( this , arguments );
return ( jQuery.fn.ready = readyList.complete ).apply( this , arguments );
},
eq: function( i ) {
@ -815,8 +815,8 @@ jQuery.extend({
// the deferred itself
deferred = {
// then( f1, f2, ...)
then: function () {
// complete( f1, f2, ...)
complete: function () {
if ( ! cancelled ) {
@ -836,7 +836,7 @@ jQuery.extend({
elem = args[ i ];
type = jQuery.type( elem );
if ( type === "array" ) {
deferred.then.apply( deferred , elem );
deferred.complete.apply( deferred , elem );
} else if ( type === "function" ) {
callbacks.push( elem );
}
@ -901,27 +901,31 @@ jQuery.extend({
// Add errorDeferred methods and redefine cancel
jQuery.extend( deferred , {
fail: failDeferred.then,
fireReject: failDeferred.fire,
reject: failDeferred.resolve,
isRejected: failDeferred.isResolved,
// Get a promise for this deferred
// If obj is provided, the promise aspect is added to the object
promise: function( obj ) {
obj = obj || {};
jQuery.each( "then fail isResolved isRejected".split( " " ) , function( _ , method ) {
obj[ method ] = deferred[ method ];
});
obj.promise = function() {
return obj;
};
then: function( completeCallbacks , failCallbacks ) {
deferred.complete( completeCallbacks ).fail( failCallbacks );
return this;
},
fail: failDeferred.complete,
fireReject: failDeferred.fire,
reject: failDeferred.resolve,
isRejected: failDeferred.isResolved,
// Get a promise for this deferred
// If obj is provided, the promise aspect is added to the object
promise: function( obj ) {
obj = obj || {};
jQuery.each( "then complete fail isResolved isRejected".split( " " ) , function( _ , method ) {
obj[ method ] = deferred[ method ];
});
obj.promise = function() {
return obj;
}
};
return obj;
}
} );
// Make sure only one callback list will be used
deferred.then( failDeferred.cancel ).fail( deferred.cancel );
deferred.then( failDeferred.cancel , deferred.cancel );
// Unexpose cancel
delete deferred.cancel;