Makes the promise method of Deferreds a bit more readable by not using the variable...

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 915ac6b..31330e8 100644 (file)
--- 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,
@@ -302,7 +294,7 @@ jQuery.fn = jQuery.prototype = {
 jQuery.fn.init.prototype = jQuery.fn;
 
 jQuery.extend = jQuery.fn.extend = function() {
-        var options, name, src, copy, copyIsArray, clone,
+       var options, name, src, copy, copyIsArray, clone,
                target = arguments[0] || {},
                i = 1,
                length = arguments.length,
@@ -574,10 +566,8 @@ jQuery.extend({
                if ( data && rnotwhite.test(data) ) {
                        // Inspired by code by Andrea Giammarchi
                        // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-                       var head = document.getElementsByTagName("head")[0] || document.documentElement,
-                               script = document.createElement("script");
-
-                       script.type = "text/javascript";
+                       var head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement,
+                               script = document.createElement( "script" );
 
                        if ( jQuery.support.scriptEval() ) {
                                script.appendChild( document.createTextNode( data ) );
@@ -887,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 );
@@ -908,28 +897,11 @@ jQuery.extend({
                                        }
                                        promise = obj = {};
                                }
-                               for( var methodName in promiseMethods ) {
-                                       obj[ methodName ] = deferred[ methodName ];
+                               var i = promiseMethods.length;
+                               while( i-- ) {
+                                       obj[ promiseMethods[ i ] ] = deferred[ promiseMethods[ i ] ];
                                }
                                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] ];
-                               }
-                               obj.then = invert.then || function( doneCallbacks, failCallbacks ) {
-                                       deferred.done( failCallbacks ).fail( doneCallbacks );
-                                       return this;
-                               };
-                               return obj;
                        }
                } );
                // Make sure only one callback list will be used
@@ -1078,6 +1050,6 @@ function doScrollCheck() {
 }
 
 // Expose jQuery to the global object
-return (window.jQuery = window.$ = jQuery);
+return jQuery;
 
 })();