github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-07 22:15:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed custom method in isDeferred and when.

Browse Source
This commit is contained in:
unknown
2010-12-25 12:52:53 +01:00
committed by jaubourg
parent 23d455b446
commit 240d8b681e
2 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core.js
View File

@@ -936,20 +936,15 @@ jQuery.extend({
},
// Check if an object is a deferred
isDeferred: function( object , method ) {
method = method || "then";
return !!( object && object[ method ] && object[ method ]._ === deferredMarker );
isDeferred: function( object ) {
return !!( object && object.then && object.then._ === deferredMarker );
},
// Deferred helper
when: function( object , method ) {
method = method || "then";
object = jQuery.isDeferred( object , method ) ?
when: function( object ) {
object = jQuery.isDeferred( object ) ?
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;
},