Moved jQuery.ajax.prefilter and jQuery.ajax.transport to jQuery.ajaxPrefilter and...

diff --git a/src/ajax.js b/src/ajax.js
index a2ef4397bd08040b30ae762a175dec6862be06a6..645163ad20249eebdc1c31b6d5a102f606228692 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -161,6 +161,7 @@ jQuery.extend({
 
        ajaxSetup: function( settings ) {
                jQuery.extend( true, jQuery.ajaxSettings, settings );
+               return this;
        },
 
        ajaxSettings: {
@@ -599,7 +600,7 @@ jQuery.extend({
                }
 
                // Get transport
-               transport = jQuery.ajax.prefilter( s , options ).transport( s );
+               transport = jQuery.ajaxPrefilter( s , options ).ajaxTransport( s );
 
                // Watch for a new set of requests
                if ( s.global && jQuery.active++ === 0 ) {
@@ -849,7 +850,7 @@ function ajax_selectOrExecute( structure , s ) {
                }
        }
 
-       return noSelect ? jQuery.ajax : selected;
+       return noSelect ? jQuery : selected;
 }
 
 // Add an element to one of the structures in ajaxSettings
@@ -908,13 +909,13 @@ function ajax_addElement( structure , args ) {
                }
        }
 
-       return jQuery.ajax;
+       return jQuery;
 }
 
 // Install prefilter & transport methods
-jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
-       _ = name + "s";
-       jQuery.ajax[ name ] = function() {
+jQuery.each( [ "Prefilter" , "Transport" ] , function( _ , name ) {
+       _ = name.toLowerCase() + "s";
+       jQuery[ "ajax" + name ] = function() {
                return ajax_addElement( _ , arguments );
        };
 } );

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index dd04b34b02c90bbe9de1402458ff8eaef28e776b..1df5dd42792bbcf8aadedc87e2e596ec20faff28 100644 (file)
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -10,12 +10,11 @@ jQuery.ajaxSetup({
        jsonpCallback: function() {
                return "jsonp" + jsc++;
        }
-});
 
 // Normalize jsonp queries
 // 1) put callback parameter in url or data
 // 2) sneakily ensure transportDataType is always jsonp for jsonp requests
-jQuery.ajax.prefilter("json jsonp", function(s, originalSettings) {
+}).ajaxPrefilter("json jsonp", function(s, originalSettings) {
 
        if ( s.dataTypes[ 0 ] === "jsonp" ||
                originalSettings.jsonp ||
@@ -38,7 +37,7 @@ jQuery.ajax.prefilter("json jsonp", function(s, originalSettings) {
        }
 
 // Bind transport to jsonp dataType
-}).transport("jsonp", function(s) {
+}).ajaxTransport("jsonp", function(s) {
 
        // Put callback in place
        var responseContainer,

diff --git a/src/ajax/script.js b/src/ajax/script.js
index 645ddf3355403d297719aa08c1e169cc913197f3..8e2e89ac5541c68dba5035a3ab458eb71fbedee3 100644 (file)
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -14,10 +14,9 @@ jQuery.ajaxSetup({
        converters: {
                "text script": jQuery.globalEval
        }
-});
 
 // Bind script tag hack transport
-jQuery.ajax.transport("script", function(s) {
+}).ajaxTransport("script", function(s) {
 
        // Handle cache special case
        if ( s.cache === undefined ) {

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 614bd3a0c80ee57f69ab8183bb693f074d0a2f41..34aa832fea3c8cf1ba254bda28e556d0176a9c06 100644 (file)
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -10,7 +10,7 @@ var // Next active xhr id
        xhrUnloadAbortInstalled;
 
 
-jQuery.ajax.transport( function( s , determineDataType ) {
+jQuery.ajaxTransport( function( s , determineDataType ) {
 
        // Cross domain only allowed if supported through XMLHttpRequest
        if ( ! s.crossDomain || jQuery.support.cors ) {