diff options
| author | Dave Methvin <dave.methvin@gmail.com> | 2012-05-10 23:45:14 -0400 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2012-05-11 15:02:18 -0400 |
| commit | c5fda2945c14566900d89b08c4202129e629877f (patch) | |
| tree | 113da5b584024568a014bd1057319455269a2e02 | |
| parent | fe88534b29594fdd29354f8003745eecab20b40e (diff) | |
| download | jquery-c5fda2945c14566900d89b08c4202129e629877f.tar.gz jquery-c5fda2945c14566900d89b08c4202129e629877f.zip | |
Fix #11736. Remove deprecated Deferred.isResolved/isRejected.
| -rw-r--r-- | src/deferred.js | 3 | ||||
| -rw-r--r-- | test/unit/deferred.js | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/deferred.js b/src/deferred.js index f509a9aca..a06fe2193 100644 --- a/src/deferred.js +++ b/src/deferred.js @@ -73,9 +73,6 @@ jQuery.extend({ // [ reject_list | resolve_list ].disable; progress_list.lock }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); - - // <DEPRECATED> [ isResolved | isRejected ] = [ resolve_list | reject_list ].fired - promise[ "isR" + stateString.substr( 1 ) ] = list.fired; } // deferred[ resolve | reject | notify ] = list.fire diff --git a/test/unit/deferred.js b/test/unit/deferred.js index 7ff274d56..710d221f0 100644 --- a/test/unit/deferred.js +++ b/test/unit/deferred.js @@ -8,7 +8,7 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) { test("jQuery.Deferred" + withNew, function() { - expect( 23 ); + expect( 21 ); var defer = createDeferred(); @@ -16,7 +16,6 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) { createDeferred().resolve().done(function() { ok( true , "Success on resolve" ); - ok( this.isResolved(), "Deferred is resolved" ); strictEqual( this.state(), "resolved", "Deferred is resolved (state)" ); }).fail(function() { ok( false , "Error on resolve" ); @@ -28,7 +27,6 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) { ok( false , "Success on reject" ); }).fail(function() { ok( true , "Error on reject" ); - ok( this.isRejected(), "Deferred is rejected" ); strictEqual( this.state(), "rejected", "Deferred is rejected (state)" ); }).always(function() { ok( true , "Always callback on reject" ); |