diff options
| -rw-r--r-- | src/ajax.js | 10 | ||||
| -rw-r--r-- | test/unit/ajax.js | 12 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/ajax.js b/src/ajax.js index a9faee78d..70bb49691 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -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 ); diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 20469d4e7..8a4ca7a65 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -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" ); }); } |