X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=src%2Fajax%2Fscript.js;h=731f5b609f3f4fa78dc912536d57d7cb70ac8128;hp=645ddf3355403d297719aa08c1e169cc913197f3;hb=e0b1bb8e3d66db4166ac7ee2146903bae7ab1eb9;hpb=667a3b31e6a27cfe3f209765d583bff584ecc2f6

diff --git a/src/ajax/script.js b/src/ajax/script.js
index 645ddf3..731f5b6 100644
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -2,41 +2,45 @@
 
 // Install script dataType
 jQuery.ajaxSetup({
-
 	accepts: {
-		script: "text/javascript, application/javascript"
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
 	},
-
 	contents: {
-		script: /javascript/
+		script: /javascript|ecmascript/
 	},
-
 	converters: {
-		"text script": jQuery.globalEval
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
 	}
 });
 
-// Bind script tag hack transport
-jQuery.ajax.transport("script", function(s) {
-
-	// Handle cache special case
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
 	if ( s.cache === undefined ) {
 		s.cache = false;
 	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+} );
 
-	// This transport only deals with cross domain get requests
-	if ( s.crossDomain && s.async && ( s.type === "GET" || ! s.data ) ) {
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
 
-		s.global = false;
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
 
 		var script,
-			head = document.getElementsByTagName("head")[0] || document.documentElement;
+			head = document.getElementsByTagName( "head" )[ 0 ] || document.documentElement;
 
 		return {
 
-			send: function(_, callback) {
+			send: function( _, callback ) {
 
-				script = document.createElement("script");
+				script = document.createElement( "script" );
 
 				script.async = "async";
 
@@ -47,9 +51,9 @@ jQuery.ajax.transport("script", function(s) {
 				script.src = s.url;
 
 				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _ , isAbort ) {
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
 
-					if ( ! script.readyState || /loaded|complete/.test( script.readyState ) ) {
+					if ( !script.readyState || /loaded|complete/.test( script.readyState ) ) {
 
 						// Handle memory leak in IE
 						script.onload = script.onreadystatechange = null;
@@ -60,10 +64,10 @@ jQuery.ajax.transport("script", function(s) {
 						}
 
 						// Dereference the script
-						script = 0;
+						script = undefined;
 
 						// Callback if not abort
-						if ( ! isAbort ) {
+						if ( !isAbort ) {
 							callback( 200, "success" );
 						}
 					}
@@ -75,11 +79,11 @@ jQuery.ajax.transport("script", function(s) {
 
 			abort: function() {
 				if ( script ) {
-					script.onload(0,1);
+					script.onload( 0, 1 );
 				}
 			}
 		};
 	}
-});
+} );
 
 })( jQuery );