library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ajax: remove deprecated extensions from ajax promise

Browse Source 
Fixes gh-2084
Closes gh-2092
This commit is contained in:
Oleg Gaidarenko 2015-02-15 05:41:38 +03:00
parent 8b6aeae52d
commit 9d1b989f20
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ajax.js
View File

@ -487,9 +487,7 @@ jQuery.extend({
};
// Attach deferreds
deferred.promise( jqXHR ).complete = completeDeferred.add;
jqXHR.success = jqXHR.done;
jqXHR.error = jqXHR.fail;
deferred.promise( jqXHR );
// Remove hash character (#7531: and string promotion)
// Add protocol if not provided (prefilters might expect it)
@ -619,9 +617,9 @@ jQuery.extend({
strAbort = "abort";
// Install callbacks on deferreds
for ( i in { success: 1, error: 1, complete: 1 } ) {
jqXHR[ i ]( s[ i ] );
}
completeDeferred.add( s.complete );
jqXHR.done( s.success );
jqXHR.fail( s.error );
// Get transport
transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );

12
test/unit/ajax.js
View File

@ -77,11 +77,11 @@ module( "ajax", {
},
success: true,
afterSend: function( request ) {
request.complete(function() {
request.always(function() {
ok( true, "complete" );
}).success(function() {
}).done(function() {
ok( true, "success" );
}).error(function() {
}).fail(function() {
ok( false, "error" );
});
}
@ -95,11 +95,11 @@ module( "ajax", {
},
success: true,
complete: function( xhr ) {
xhr.complete(function() {
xhr.always(function() {
ok( true, "complete" );
}).success(function() {
}).done(function() {
ok( true, "success" );
}).error(function() {
}).fail(function() {
ok( false, "error" );
});
}