Permalink
Browse files

Ajax: remove deprecated extensions from ajax promise

Fixes gh-2084
Closes gh-2092
  • Loading branch information...
markelog committed Feb 15, 2015
1 parent 8b6aeae commit 9d1b989f20b550af3590691723b0620f6914626e
Showing with 10 additions and 12 deletions.
  1. +4 −6 src/ajax.js
  2. +6 −6 test/unit/ajax.js
View
@@ -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 );
View
@@ -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" );
});
}

0 comments on commit 9d1b989

Please sign in to comment.