From: jaubourg <j@ubourg.net>
Date: Thu, 30 Dec 2010 03:43:31 +0000 (+0100)
Subject: Merge branch 'master' of github.com:jquery/jquery into deferred
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=64902e03450dc9164dbdb046a701008a249497c1;hp=7490eb4f8e1930ca370eec21b4d5469f87b65db6;p=jquery.git

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

diff --git a/src/transports/script.js b/src/transports/script.js
index 57a896d..d18f4d7 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -47,10 +47,9 @@ jQuery.ajax.transport("script", function(s) {
 				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 @@ jQuery.ajax.transport("script", function(s) {
 							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 @@ jQuery.ajax.transport("script", function(s) {
 			
 			abort: function(statusText) {
 				if ( script ) {
-					script.onload(statusText);
+					script.onload( 0 , statusText );
 				}
 			}
 		};