Fixes #8125. Status is set to 200 for requests with status 0 when location.protocol...

[jquery.git] / src / ajax / script.js

diff --git a/src/ajax/script.js b/src/ajax/script.js
index dfee867..731f5b6 100644 (file)
--- 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;
+               }
        }
 });