Merge branch 'master' of github.com:jquery/jquery into deferred

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

diff --git a/src/transports/script.js b/src/transports/script.js
index 7416a2d..d18f4d7 100644 (file)
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -7,17 +7,17 @@ jQuery.extend( true, jQuery.ajaxSettings , {
                script: "text/javascript, application/javascript"
        },
        
-       autoDataType: {
+       contents: {
                script: /javascript/
        },
                
-       dataConverters: {
-               "text => script": jQuery.globalEval
+       converters: {
+               "text script": jQuery.globalEval
        }
 } );
 
 // Bind script tag hack transport
-jQuery.xhr.bindTransport("script", function(s) {
+jQuery.ajax.transport("script", function(s) {
        
        // Handle cache special case
        if ( s.cache === undefined ) {