X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fscript.js;h=764a80699e34f89666bee271381aff1686ae514f;hb=refs%2Fheads%2Fgetscript-fix;hp=dfee86712fde9eae00a27bcda5e3ab9746ec59aa;hpb=ee22c8b34bb801f26cacc67a1a3a0ac595fe7928;p=jquery.git

diff --git a/src/ajax/script.js b/src/ajax/script.js
index dfee867..764a806 100644
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -3,13 +3,16 @@
 // 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;
+		}
 	}
 });
 
@@ -27,11 +30,14 @@ jQuery.ajaxPrefilter( "script", function( s ) {
 // Bind script tag hack transport
 jQuery.ajaxTransport( "script", function(s) {
 
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
+	// This transport primarily deals with cross domain requests
+	// but also sameDomain request within file:// due to
+	// http://code.google.com/p/chromium/issues/detail?id=4197 + 47416
+	var local = location.protocol === 'file:';
+	if ( s.crossDomain || local ) {
 
 		var script,
-			head = document.getElementsByTagName( "head" )[ 0 ] || document.documentElement;
+			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
 
 		return {