Merge branch 'master' of github.com:jquery/jquery into deferred

diff --combined src/transports/script.js
index 57a896d,7416a2d..d18f4d7
--- 1/src/transports/script.js
--- 2/src/transports/script.js
+++ b/src/transports/script.js
@@@ -7,17 -7,17 +7,17 @@@ jQuery.extend( true, jQuery.ajaxSetting
                script: "text/javascript, application/javascript"
        },
        
 -      autoDataType: {
 +      contents: {
                script: /javascript/
        },
                
 -      dataConverters: {
 -              "text => script": jQuery.globalEval
 +      converters: {
 +              "text script": jQuery.globalEval
        }
  } );
  
  // Bind script tag hack transport
 -jQuery.xhr.bindTransport("script", function(s) {
 +jQuery.ajax.transport("script", function(s) {
        
        // Handle cache special case
        if ( s.cache === undefined ) {
@@@ -47,10 -47,9 +47,9 @@@
                                script.src = s.url;
                                
                                // Attach handlers for all browsers
-                               script.onload = script.onreadystatechange = function(statusText) {
+                               script.onload = script.onreadystatechange = function( _ , statusText) {
                                        
-                                       if ( (!script.readyState ||
-                                                       script.readyState === "loaded" || script.readyState === "complete") ) {
+                                       if ( ! script.readyState || /loaded|complete/.test( script.readyState ) ) {
                                                                
                                                // Handle memory leak in IE
                                                script.onload = script.onreadystatechange = null;
@@@ -60,10 -59,10 +59,10 @@@
                                                        head.removeChild( script );
                                                }
                                                
-                                               script = undefined;
+                                               script = 0;
                                                
-                                               // Callback & dereference
-                                               callback(statusText ? 0 : 200, statusText || "success");
+                                               // Callback
+                                               callback( statusText ? 0 : 200, statusText || "success" );
                                        }
                                };
                                // Use insertBefore instead of appendChild  to circumvent an IE6 bug.
@@@ -73,7 -72,7 +72,7 @@@
                        
                        abort: function(statusText) {
                                if ( script ) {
-                                       script.onload(statusText);
+                                       script.onload( 0 , statusText );
                                }
                        }
                };