git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed custom method in isDeferred and when.
[jquery.git]
/
src
/
core.js
diff --git
a/src/core.js
b/src/core.js
index
efb1683
..
67429f7
100644
(file)
--- a/
src/core.js
+++ b/
src/core.js
@@
-936,20
+936,15
@@
jQuery.extend({
},
// Check if an object is a deferred
},
// 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
},
// 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 :
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;
},