Skip to content

Commit

Permalink
Fix #11736. Remove deprecated Deferred.isResolved/isRejected.
Browse files Browse the repository at this point in the history
  • Loading branch information
dmethvin committed May 11, 2012
1 parent fe88534 commit c5fda29
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
3 changes: 0 additions & 3 deletions src/deferred.js
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions test/unit/deferred.js
Expand Up @@ -8,15 +8,14 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) {

test("jQuery.Deferred" + withNew, function() {

expect( 23 );
expect( 21 );

var defer = createDeferred();

strictEqual( defer.pipe, defer.then, "pipe is an alias of then" );

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" );
Expand All @@ -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" );
Expand Down

0 comments on commit c5fda29

Please sign in to comment.