Permalink
Browse files

Fix #11736. Remove deprecated Deferred.isResolved/isRejected.

  • Loading branch information...
dmethvin committed May 11, 2012
1 parent fe88534 commit c5fda2945c14566900d89b08c4202129e629877f
Showing with 1 addition and 6 deletions.
  1. +0 −3 src/deferred.js
  2. +1 −3 test/unit/deferred.js
View
@@ -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
View
@@ -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" );
@@ -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" );

0 comments on commit c5fda29

Please sign in to comment.