indexOf = Array.prototype.indexOf,
// [[Class]] -> type pairs
- class2type = {},
-
- // Marker for deferred
- deferredMarker = [];
+ class2type = {};
jQuery.fn = jQuery.prototype = {
init: function( selector, context ) {
// resolve with this as context and given arguments
resolve: function() {
- deferred.fire( this , arguments );
+ deferred.fire( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments );
return this;
},
cancelled = 1;
callbacks = [];
return this;
- },
-
- // Has this deferred been cancelled?
- isCancelled: function() {
- return !!cancelled;
}
};
- // Add the deferred marker
- deferred.then._ = deferredMarker;
-
return deferred;
},
// Typical success/error system
Deferred: function( func ) {
- var errorDeferred = jQuery._Deferred(),
- deferred = jQuery._Deferred(),
- successCancel = deferred.cancel;
+ var deferred = jQuery._Deferred(),
+ failDeferred = jQuery._Deferred();
// Add errorDeferred methods and redefine cancel
jQuery.extend( deferred , {
- fail: errorDeferred.then,
- fireReject: errorDeferred.fire,
- reject: errorDeferred.resolve,
- isRejected: errorDeferred.isResolved
+ fail: failDeferred.then,
+ fireReject: failDeferred.fire,
+ reject: failDeferred.resolve,
+ isRejected: failDeferred.isResolved,
+ // Get a promise for this deferred
+ // If obj is provided, the promise aspect is added to the object
+ promise: function( obj ) {
+ obj = obj || {};
+ jQuery.each( "then fail isResolved isRejected".split( " " ) , function( _ , method ) {
+ obj[ method ] = deferred[ method ];
+ });
+ obj.promise = function() {
+ return obj;
+ };
+ return obj;
+ }
} );
- // Remove cancel related
- delete deferred.cancel;
- delete deferred.isCancelled;
-
// Make sure only one callback list will be used
- deferred.then( errorDeferred.cancel ).fail( successCancel );
+ deferred.then( failDeferred.cancel ).fail( deferred.cancel );
+
+ // Unexpose cancel
+ delete deferred.cancel;
// Call given func if any
if ( func ) {
return deferred;
},
- // Check if an object is a deferred
- isDeferred: function( object , method ) {
- method = method || "then";
- return !!( object && object[ method ] && object[ method ]._ === deferredMarker );
- },
-
// Deferred helper
- when: function( object , method ) {
- method = method || "then";
- object = jQuery.isDeferred( object , method ) ?
+ when: function( object ) {
+ object = object && jQuery.isFunction( object.promise ) ?
object :
jQuery.Deferred().resolve( object );
- object.fail = object.fail || function() { return this; };
- object[ method ] = object[ method ] || object.then;
- object.then = object.then || object[ method ];
- return object;
+ return object.promise();
},
// Use of jQuery.browser is frowned upon.
});
// Create readyList deferred
-// also force $.fn.ready to be recognized as a defer
readyList = jQuery._Deferred();
-jQuery.fn.ready._ = deferredMarker;
// Populate the class2type map
jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {