aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ajax/script.js13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/ajax/script.js b/src/ajax/script.js
index 203ea08e0..fee8a66e0 100644
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -19,22 +19,13 @@ function canUseScriptTag( s ) {
( s.async && jQuery.inArray( "json", s.dataTypes ) < 0 );
}
-// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
-jQuery.ajaxPrefilter( function( s ) {
- if ( s.crossDomain ) {
- s.contents.script = false;
- }
-} );
-
-// Install script dataType
+// Install script dataType. Don't specify `content.script` so that an explicit
+// `dataType: "script"` is required (see gh-2432, gh-4822)
jQuery.ajaxSetup( {
accepts: {
script: "text/javascript, application/javascript, " +
"application/ecmascript, application/x-ecmascript"
},
- contents: {
- script: /\b(?:java|ecma)script\b/
- },
converters: {
"text script": function( text ) {
jQuery.globalEval( text );