diff options
| author | unknown <Julian@.(none)> | 2010-12-25 12:52:53 +0100 |
|---|---|---|
| committer | jaubourg <j@ubourg.net> | 2010-12-31 04:05:56 +0100 |
| commit | 240d8b681e222dcbc50192331ed7ba00b0e07e0e (patch) | |
| tree | fe6f4c2326b28ba5e70840ca772d4f27abe2288f /src/core.js | |
| parent | 23d455b4469f2b47363c21867aad271d6930f112 (diff) | |
| download | jquery-240d8b681e222dcbc50192331ed7ba00b0e07e0e.tar.gz jquery-240d8b681e222dcbc50192331ed7ba00b0e07e0e.zip | |
Removed custom method in isDeferred and when.
Diffstat (limited to 'src/core.js')
| -rw-r--r-- | src/core.js | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/core.js b/src/core.js index efb168306..67429f779 100644 --- a/src/core.js +++ b/src/core.js @@ -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; }, |