aboutsummaryrefslogtreecommitdiffstats
path: root/src/core.js
diff options
context:
space:
mode:
authorjaubourg <j@ubourg.net>2011-02-18 18:06:26 +0100
committerjaubourg <j@ubourg.net>2011-02-18 18:06:26 +0100
commita43a5ca9cf79afcd662df5b9110d7ccba45c0b53 (patch)
tree49d3e390438477e44b0240a9405bd00c505cb4c4 /src/core.js
parent752db8fffeffa796f5cdb5553331436c0a4cc44e (diff)
downloadjquery-a43a5ca9cf79afcd662df5b9110d7ccba45c0b53.tar.gz
jquery-a43a5ca9cf79afcd662df5b9110d7ccba45c0b53.zip
Revert "Adds an invert method to promises that returns a "inverted" promise that is resolved when the underlying deferred is rejected and rejected when the underlying deferred is resolved."
This reverts commit 4e975430510f443ef76a90d077bc8956fb8b8cc0.
Diffstat (limited to 'src/core.js')
-rw-r--r--src/core.js42
1 files changed, 8 insertions, 34 deletions
diff --git a/src/core.js b/src/core.js
index 586e372de..e7efb6556 100644
--- a/src/core.js
+++ b/src/core.js
@@ -56,16 +56,8 @@ var jQuery = function( selector, context ) {
// The deferred used on DOM ready
readyList,
- // Promise methods (with equivalent for invert)
- promiseMethods = {
- then: 0, // will be overwritten for invert
- done: "fail",
- fail: "done",
- isResolved: "isRejected",
- isRejected: "isResolved",
- promise: "invert",
- invert: "promise"
- },
+ // Promise methods
+ promiseMethods = "then done fail isResolved isRejected promise".split( " " ),
// The ready event handler
DOMContentLoaded,
@@ -885,9 +877,8 @@ jQuery.extend({
Deferred: function( func ) {
var deferred = jQuery._Deferred(),
failDeferred = jQuery._Deferred(),
- promise,
- invert;
- // Add errorDeferred methods, then, promise and invert
+ promise;
+ // Add errorDeferred methods, then and promise
jQuery.extend( deferred, {
then: function( doneCallbacks, failCallbacks ) {
deferred.done( doneCallbacks ).fail( failCallbacks );
@@ -899,34 +890,17 @@ jQuery.extend({
isRejected: failDeferred.isResolved,
// Get a promise for this deferred
// If obj is provided, the promise aspect is added to the object
- promise: function( obj ) {
+ promise: function( obj , i /* internal */ ) {
if ( obj == null ) {
if ( promise ) {
return promise;
}
promise = obj = {};
}
- for( var methodName in promiseMethods ) {
- obj[ methodName ] = deferred[ methodName ];
- }
- return obj;
- },
- // Get the invert promise for this deferred
- // If obj is provided, the invert promise aspect is added to the object
- invert: function( obj ) {
- if ( obj == null ) {
- if ( invert ) {
- return invert;
- }
- invert = obj = {};
- }
- for( var methodName in promiseMethods ) {
- obj[ methodName ] = promiseMethods[ methodName ] && deferred[ promiseMethods[methodName] ];
+ i = promiseMethods.length;
+ while( i-- ) {
+ obj[ promiseMethods[ i ] ] = deferred[ promiseMethods[ i ] ];
}
- obj.then = invert.then || function( doneCallbacks, failCallbacks ) {
- deferred.done( failCallbacks ).fail( doneCallbacks );
- return this;
- };
return obj;
}
} );