deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Deferred cannot be cancelled by returning false in a callback. Exception in the callback are still propagated and execution of remaining callbacks is still possible.

Browse source
This commit is contained in:
unknown 2010-12-25 01:29:04 +01:00 • committed by jaubourg
parent fd63416ab1
commit 23d455b446
2 changed files with 43 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

81
test/unit/core.js
View file

@ -907,7 +907,7 @@ test("jQuery.parseJSON", function(){
test("jQuery._Deferred()", function() {
expect( 14 );
expect( 10 );
var deferred,
object,
@ -940,31 +940,19 @@ test("jQuery._Deferred()", function() {
test = true;
deferred.then( function() {
ok( false , "Manual cancel was ignored" );
ok( false , "Cancel was ignored" );
test = false;
} );
ok( test , "Test manual cancel" );
ok( test , "Test cancel" );
deferred = jQuery._Deferred().then( function() {
return false;
} );
deferred = jQuery._Deferred().resolve();
deferred.resolve();
test = true;
deferred.then( function() {
test = false;
} );
ok( test , "Test cancel by returning false" );
try {
deferred = jQuery._Deferred().resolve().then( function() {
deferred.then( function() {
throw "Error";
} , function() {
ok( false , "Test deferred cancel on exception" );
ok( true , "Test deferred do not cancel on exception" );
} );
} catch( e ) {
strictEqual( e , "Error" , "Test deferred propagates exceptions");
@ -1003,28 +991,6 @@ test("jQuery._Deferred()", function() {
strictEqual( test , "ABC" , "Test then callbacks order" );
deferred = jQuery._Deferred( false ).resolve().cancel();
deferred.then( function() {
ok( true , "Test non-cancellable deferred not cancelled manually");
return false;
} );
deferred.then( function() {
ok( true , "Test non-cancellable deferred not cancelled by returning false");
} );
try {
deferred.then( function() {
throw "Error";
} , function() {
ok( true , "Test non-cancellable deferred keeps callbacks after exception" );
} );
} catch( e ) {
strictEqual( e , "Error" , "Test non-cancellable deferred propagates exceptions");
deferred.then();
}
deferred = jQuery._Deferred();
deferred.fire( jQuery , [ document ] ).then( function( doc ) {
@ -1034,7 +1000,7 @@ test("jQuery._Deferred()", function() {
test("jQuery.Deferred()", function() {
expect( 8 );
expect( 4 );
jQuery.Deferred( function( defer ) {
strictEqual( this , defer , "Defer passed as this & first argument" );
@ -1054,39 +1020,6 @@ test("jQuery.Deferred()", function() {
}).fail( function() {
ok( true , "Error on reject" );
});
var flag = true;
jQuery.Deferred().resolve().cancel().then( function() {
ok( flag = false , "Success on resolve/cancel" );
}).fail( function() {
ok( flag = false , "Error on resolve/cancel" );
});
ok( flag , "Cancel on resolve" );
flag = true;
jQuery.Deferred().reject().cancel().then( function() {
ok( flag = false , "Success on reject/cancel" );
}).fail( function() {
ok( flag = false , "Error on reject/cancel" );
});
ok( flag , "Cancel on reject" );
jQuery.Deferred( false ).resolve().then( function() {
return false;
} , function() {
ok( true , "Not cancelled on resolve" );
});
jQuery.Deferred( false ).reject().fail( function() {
return false;
} , function() {
ok( true , "Not cancelled on reject" );
});
});
test("jQuery.isDeferred()", function() {