aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjaubourg <j@ubourg.net>2011-01-12 18:54:15 +0100
committerjaubourg <j@ubourg.net>2011-01-12 18:54:15 +0100
commite221d39e981ceac030d2e0431570742fb51337d5 (patch)
tree3808f2cba71c6f25479c27bfbe1bcd48801a2f55 /src
parent14b07ec5de0437278806d12d058a249940eb531b (diff)
downloadjquery-e221d39e981ceac030d2e0431570742fb51337d5.tar.gz
jquery-e221d39e981ceac030d2e0431570742fb51337d5.zip
Script transport now uses ajaxSetup to define script dataType.
Diffstat (limited to 'src')
-rw-r--r--src/ajax/script.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ajax/script.js b/src/ajax/script.js
index 0db0de6c7..75f34fce2 100644
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -1,7 +1,7 @@
(function( jQuery ) {
-// Install text to script executor
-jQuery.extend( true, jQuery.ajaxSettings , {
+// Install script dataType
+jQuery.ajaxSetup({
accepts: {
script: "text/javascript, application/javascript"
@@ -14,7 +14,7 @@ jQuery.extend( true, jQuery.ajaxSettings , {
converters: {
"text script": jQuery.globalEval
}
-} );
+});
// Bind script tag hack transport
jQuery.ajax.transport("script", function(s) {