Skip to content
Permalink
Browse files

Capitalized Deferred & _Deferred to clearly mark them as new types, l…

…ike Event.
  • Loading branch information...
unknown authored and jaubourg committed Dec 24, 2010
1 parent 22e28b0 commit 2d4001b82c6325ac6a767294e96a8af8f920f7cd
Showing with 28 additions and 28 deletions.
  1. +6 −6 src/core.js
  2. +2 −2 src/xhr.js
  3. +20 −20 test/unit/core.js
@@ -805,7 +805,7 @@ jQuery.extend({
},

// Create a simple deferred (one callbacks list)
_deferred: function( cancellable ) {
_Deferred: function( cancellable ) {

// cancellable by default
cancellable = cancellable !== false;
@@ -901,7 +901,7 @@ jQuery.extend({

// Full fledged deferred (two callbacks list)
// Typical success/error system
deferred: function( func , cancellable ) {
Deferred: function( func , cancellable ) {

// Handle varargs
if ( arguments.length === 1 ) {
@@ -912,8 +912,8 @@ jQuery.extend({
}
}

var errorDeferred = jQuery._deferred( cancellable ),
deferred = jQuery._deferred( cancellable ),
var errorDeferred = jQuery._Deferred( cancellable ),
deferred = jQuery._Deferred( cancellable ),
// Keep reference of the cancel method since we'll redefine it
cancelThen = deferred.cancel;

@@ -953,7 +953,7 @@ jQuery.extend({
method = method || "then";
object = jQuery.isDeferred( object , method ) ?
object :
jQuery.deferred().resolve( object );
jQuery.Deferred().resolve( object );
object.fail = object.fail || function() { return this; };
object[ method ] = object[ method ] || object.then;
object.then = object.then || object[ method ];
@@ -979,7 +979,7 @@ jQuery.extend({

// Create readyList deferred
// also force $.fn.ready to be recognized as a defer
readyList = jQuery._deferred( false );
readyList = jQuery._Deferred( false );
jQuery.fn.ready._ = deferredMarker;

// Populate the class2type map
@@ -23,8 +23,8 @@ jQuery.xhr = function( _native ) {
if ( force || internal ) {

// Reset callbacks lists
deferred = jQuery.deferred();
completeDeferred = jQuery._deferred();
deferred = jQuery.Deferred();
completeDeferred = jQuery._Deferred();

xhr.success = xhr.then = deferred.then;
xhr.error = xhr.fail = deferred.fail;
@@ -905,15 +905,15 @@ test("jQuery.parseJSON", function(){
}
});

test("jQuery._deferred()", function() {
test("jQuery._Deferred()", function() {

expect( 14 );

var deferred,
object,
test;

deferred = jQuery._deferred();
deferred = jQuery._Deferred();

test = false;

@@ -946,7 +946,7 @@ test("jQuery._deferred()", function() {

ok( test , "Test manual cancel" );

deferred = jQuery._deferred().then( function() {
deferred = jQuery._Deferred().then( function() {
return false;
} );

@@ -961,7 +961,7 @@ test("jQuery._deferred()", function() {
ok( test , "Test cancel by returning false" );

try {
deferred = jQuery._deferred().resolve().then( function() {
deferred = jQuery._Deferred().resolve().then( function() {
throw "Error";
} , function() {
ok( false , "Test deferred cancel on exception" );
@@ -972,7 +972,7 @@ test("jQuery._deferred()", function() {
}

test = "";
deferred = jQuery._deferred().then( function() {
deferred = jQuery._Deferred().then( function() {

test += "A";

@@ -1003,7 +1003,7 @@ test("jQuery._deferred()", function() {

strictEqual( test , "ABC" , "Test then callbacks order" );

deferred = jQuery._deferred( false ).resolve().cancel();
deferred = jQuery._Deferred( false ).resolve().cancel();

deferred.then( function() {
ok( true , "Test non-cancellable deferred not cancelled manually");
@@ -1025,39 +1025,39 @@ test("jQuery._deferred()", function() {
deferred.then();
}

deferred = jQuery._deferred();
deferred = jQuery._Deferred();

deferred.fire( jQuery , [ document ] ).then( function( doc ) {
ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
});
});

test("jQuery.deferred()", function() {
test("jQuery.Deferred()", function() {

expect( 8 );

jQuery.deferred( function( defer ) {
jQuery.Deferred( function( defer ) {
strictEqual( this , defer , "Defer passed as this & first argument" );
this.resolve( "done" );
}).then( function( value ) {
strictEqual( value , "done" , "Passed function executed" );
});

jQuery.deferred().resolve().then( function() {
jQuery.Deferred().resolve().then( function() {
ok( true , "Success on resolve" );
}).fail( function() {
ok( false , "Error on resolve" );
});

jQuery.deferred().reject().then( function() {
jQuery.Deferred().reject().then( function() {
ok( false , "Success on reject" );
}).fail( function() {
ok( true , "Error on reject" );
});

var flag = true;

jQuery.deferred().resolve().cancel().then( function() {
jQuery.Deferred().resolve().cancel().then( function() {
ok( flag = false , "Success on resolve/cancel" );
}).fail( function() {
ok( flag = false , "Error on resolve/cancel" );
@@ -1067,21 +1067,21 @@ test("jQuery.deferred()", function() {

flag = true;

jQuery.deferred().reject().cancel().then( function() {
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() {
jQuery.Deferred( false ).resolve().then( function() {
return false;
} , function() {
ok( true , "Not cancelled on resolve" );
});

jQuery.deferred( false ).reject().fail( function() {
jQuery.Deferred( false ).reject().fail( function() {
return false;
} , function() {
ok( true , "Not cancelled on reject" );
@@ -1099,8 +1099,8 @@ test("jQuery.isDeferred()", function() {
object2.then._ = [];

// The use case that we want to match
ok(jQuery.isDeferred(jQuery._deferred()), "Simple deferred");
ok(jQuery.isDeferred(jQuery.deferred()), "Failable deferred");
ok(jQuery.isDeferred(jQuery._Deferred()), "Simple deferred");
ok(jQuery.isDeferred(jQuery.Deferred()), "Failable deferred");

// Some other objects
ok(!jQuery.isDeferred(object1), "Object with then & no marker");
@@ -1113,7 +1113,7 @@ test("jQuery.isDeferred()", function() {
ok(!jQuery.isDeferred(null), "null");
ok(!jQuery.isDeferred(undefined), "undefined");

object1 = {custom: jQuery._deferred().then};
object1 = {custom: jQuery._Deferred().then};

ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
ok(jQuery.isDeferred(object1,"custom") , "custom method name");
@@ -1123,10 +1123,10 @@ test("jQuery.when()", function() {

expect( 5 );

var cache, i, deferred = { done: jQuery.deferred().resolve( 1 ).then };
var cache, i, deferred = { done: jQuery.Deferred().resolve( 1 ).then };

for( i = 1 ; i < 3 ; i++ ) {
jQuery.when( cache || jQuery.deferred( function() {
jQuery.when( cache || jQuery.Deferred( function() {
this.resolve( i );
}) ).then( function( value ) {
strictEqual( value , 1 , "Function executed" + ( i > 1 ? " only once" : "" ) );

0 comments on commit 2d4001b

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.