Revert "Fixes #8353. Adds a catch block in resolveWith so that the finally block...

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index faf205c..036b2db 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -294,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,
@@ -566,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 ) );
@@ -892,22 +890,22 @@ 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 , i /* internal */ ) {
+                       promise: function( obj ) {
                                if ( obj == null ) {
                                        if ( promise ) {
                                                return promise;
                                        }
                                        promise = obj = {};
                                }
-                               i = promiseMethods.length;
+                               var i = promiseMethods.length;
                                while( i-- ) {
-                                       obj[ promiseMethods[ i ] ] = deferred[ promiseMethods[ i ] ];
+                                       obj[ promiseMethods[i] ] = deferred[ promiseMethods[i] ];
                                }
                                return obj;
                        }
                } );
                // Make sure only one callback list will be used
-               deferred.then( failDeferred.cancel, deferred.cancel );
+               deferred.done( failDeferred.cancel ).fail( deferred.cancel );
                // Unexpose cancel
                delete deferred.cancel;
                // Call given func if any
@@ -919,24 +917,34 @@ jQuery.extend({
 
        // Deferred helper
        when: function( object ) {
-               var args = arguments,
-                       length = args.length,
-                       deferred = length <= 1 && object && jQuery.isFunction( object.promise ) ?
+               var lastIndex = arguments.length,
+                       deferred = lastIndex <= 1 && object && jQuery.isFunction( object.promise ) ?
                                object :
                                jQuery.Deferred(),
-                       promise = deferred.promise(),
-                       resolveArray;
-
-               if ( length > 1 ) {
-                       resolveArray = new Array( length );
-                       jQuery.each( args, function( index, element ) {
-                               jQuery.when( element ).then( function( value ) {
-                                       resolveArray[ index ] = arguments.length > 1 ? slice.call( arguments, 0 ) : value;
-                                       if( ! --length ) {
-                                               deferred.resolveWith( promise, resolveArray );
-                                       }
-                               }, deferred.reject );
-                       } );
+                       promise = deferred.promise();
+
+               if ( lastIndex > 1 ) {
+                       var array = slice.call( arguments, 0 ),
+                               count = lastIndex,
+                               iCallback = function( index ) {
+                                       return function( value ) {
+                                               array[ index ] = arguments.length > 1 ? slice.call( arguments, 0 ) : value;
+                                               if ( !( --count ) ) {
+                                                       deferred.resolveWith( promise, array );
+                                               }
+                                       };
+                               };
+                       while( ( lastIndex-- ) ) {
+                               object = array[ lastIndex ];
+                               if ( object && jQuery.isFunction( object.promise ) ) {
+                                       object.promise().then( iCallback(lastIndex), deferred.reject );
+                               } else {
+                                       --count;
+                               }
+                       }
+                       if ( !count ) {
+                               deferred.resolveWith( promise, array );
+                       }
                } else if ( deferred !== object ) {
                        deferred.resolve( object );
                }
@@ -1052,6 +1060,6 @@ function doScrollCheck() {
 }
 
 // Expose jQuery to the global object
-return (window.jQuery = window.$ = jQuery);
+return jQuery;
 
 })();