Fixes #8115. Renames all references to jXHR with jqXHR in the code (like was done...

diff --git a/src/ajax.js b/src/ajax.js
index 3158ca44a95fb82407eaa872b86da5134958fece..4c3f1dd53429fb3ef1eeab09a34f7fce00348374 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -73,7 +73,7 @@ function addToPrefiltersOrTransports( structure ) {
 }
 
 //Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jXHR,
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
                dataType /* internal */, inspected /* internal */ ) {
 
        dataType = dataType || options.dataTypes[ 0 ];
@@ -88,7 +88,7 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jXH
                selection;
 
        for(; i < length && ( executeOnly || !selection ); i++ ) {
-               selection = list[ i ]( options, originalOptions, jXHR );
+               selection = list[ i ]( options, originalOptions, jqXHR );
                // If we got redirected to another dataType
                // we try there if not done already
                if ( typeof selection === "string" ) {
@@ -97,7 +97,7 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jXH
                        } else {
                                options.dataTypes.unshift( selection );
                                selection = inspectPrefiltersOrTransports(
-                                               structure, options, originalOptions, jXHR, selection, inspected );
+                                               structure, options, originalOptions, jqXHR, selection, inspected );
                        }
                }
        }
@@ -105,7 +105,7 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jXH
        // we try the catchall dataType if not done already
        if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
                selection = inspectPrefiltersOrTransports(
-                               structure, options, originalOptions, jXHR, "*", inspected );
+                               structure, options, originalOptions, jqXHR, "*", inspected );
        }
        // unnecessary when only executing (prefilters)
        // but it'll be ignored by the caller in that case
@@ -155,14 +155,14 @@ jQuery.fn.extend({
                        dataType: "html",
                        data: params,
                        // Complete callback (responseText is used internally)
-                       complete: function( jXHR, status, responseText ) {
-                               // Store the response as specified by the jXHR object
-                               responseText = jXHR.responseText;
+                       complete: function( jqXHR, status, responseText ) {
+                               // Store the response as specified by the jqXHR object
+                               responseText = jqXHR.responseText;
                                // If successful, inject the HTML into all the matched elements
-                               if ( jXHR.isResolved() ) {
+                               if ( jqXHR.isResolved() ) {
                                        // #4825: Get the actual response in case
                                        // a dataFilter is present in ajaxSettings
-                                       jXHR.done(function( r ) {
+                                       jqXHR.done(function( r ) {
                                                responseText = r;
                                        });
                                        // See if a selector was specified
@@ -181,7 +181,7 @@ jQuery.fn.extend({
                                }
 
                                if ( callback ) {
-                                       self.each( callback, [ responseText, status, jXHR ] );
+                                       self.each( callback, [ responseText, status, jqXHR ] );
                                }
                        }
                });
@@ -364,12 +364,12 @@ jQuery.extend({
                        loc = document.location,
                        protocol = loc.protocol || "http:",
                        parts,
-                       // The jXHR state
+                       // The jqXHR state
                        state = 0,
                        // Loop variable
                        i,
                        // Fake xhr
-                       jXHR = {
+                       jqXHR = {
 
                                readyState: 0,
 
@@ -431,19 +431,19 @@ jQuery.extend({
                        }
 
                        // Dereference transport for early garbage collection
-                       // (no matter how long the jXHR object will be used)
+                       // (no matter how long the jqXHR object will be used)
                        transport = undefined;
 
                        // Cache response headers
                        responseHeadersString = headers || "";
 
                        // Set readyState
-                       jXHR.readyState = status ? 4 : 0;
+                       jqXHR.readyState = status ? 4 : 0;
 
                        var isSuccess,
                                success,
                                error,
-                               response = responses ? ajaxHandleResponses( s, jXHR, responses ) : undefined,
+                               response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
                                lastModified,
                                etag;
 
@@ -453,10 +453,10 @@ jQuery.extend({
                                // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
                                if ( s.ifModified ) {
 
-                                       if ( ( lastModified = jXHR.getResponseHeader( "Last-Modified" ) ) ) {
+                                       if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
                                                jQuery.lastModified[ ifModifiedKey ] = lastModified;
                                        }
-                                       if ( ( etag = jXHR.getResponseHeader( "Etag" ) ) ) {
+                                       if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
                                                jQuery.etag[ ifModifiedKey ] = etag;
                                        }
                                }
@@ -493,30 +493,30 @@ jQuery.extend({
                        }
 
                        // Set data for the fake xhr object
-                       jXHR.status = status;
-                       jXHR.statusText = statusText;
+                       jqXHR.status = status;
+                       jqXHR.statusText = statusText;
 
                        // Success/Error
                        if ( isSuccess ) {
-                               deferred.resolveWith( callbackContext, [ success, statusText, jXHR ] );
+                               deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
                        } else {
-                               deferred.rejectWith( callbackContext, [ jXHR, statusText, error ] );
+                               deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
                        }
 
                        // Status-dependent callbacks
-                       jXHR.statusCode( statusCode );
+                       jqXHR.statusCode( statusCode );
                        statusCode = undefined;
 
                        if ( s.global ) {
                                globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
-                                               [ jXHR, s, isSuccess ? success : error ] );
+                                               [ jqXHR, s, isSuccess ? success : error ] );
                        }
 
                        // Complete
-                       completeDeferred.resolveWith( callbackContext, [ jXHR, statusText ] );
+                       completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] );
 
                        if ( s.global ) {
-                               globalEventContext.trigger( "ajaxComplete", [ jXHR, s] );
+                               globalEventContext.trigger( "ajaxComplete", [ jqXHR, s] );
                                // Handle the global AJAX counter
                                if ( !( --jQuery.active ) ) {
                                        jQuery.event.trigger( "ajaxStop" );
@@ -525,13 +525,13 @@ jQuery.extend({
                }
 
                // Attach deferreds
-               deferred.promise( jXHR );
-               jXHR.success = jXHR.done;
-               jXHR.error = jXHR.fail;
-               jXHR.complete = completeDeferred.done;
+               deferred.promise( jqXHR );
+               jqXHR.success = jqXHR.done;
+               jqXHR.error = jqXHR.fail;
+               jqXHR.complete = completeDeferred.done;
 
                // Status-dependent callbacks
-               jXHR.statusCode = function( map ) {
+               jqXHR.statusCode = function( map ) {
                        if ( map ) {
                                var tmp;
                                if ( state < 2 ) {
@@ -539,8 +539,8 @@ jQuery.extend({
                                                statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
                                        }
                                } else {
-                                       tmp = map[ jXHR.status ];
-                                       jXHR.then( tmp, tmp );
+                                       tmp = map[ jqXHR.status ];
+                                       jqXHR.then( tmp, tmp );
                                }
                        }
                        return this;
@@ -570,7 +570,7 @@ jQuery.extend({
                }
 
                // Apply prefilters
-               inspectPrefiltersOrTransports( prefilters, s, options, jXHR );
+               inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
 
                // Uppercase the type
                s.type = s.type.toUpperCase();
@@ -633,36 +633,36 @@ jQuery.extend({
                }
 
                // Allow custom headers/mimetypes and early abort
-               if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jXHR, s ) === false || state === 2 ) ) {
+               if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
                                // Abort if not done already
                                done( 0, "abort" );
                                // Return false
-                               jXHR = false;
+                               jqXHR = false;
 
                } else {
 
                        // Install callbacks on deferreds
                        for ( i in { success: 1, error: 1, complete: 1 } ) {
-                               jXHR[ i ]( s[ i ] );
+                               jqXHR[ i ]( s[ i ] );
                        }
 
                        // Get transport
-                       transport = inspectPrefiltersOrTransports( transports, s, options, jXHR );
+                       transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
 
                        // If no transport, we auto-abort
                        if ( !transport ) {
                                done( -1, "No Transport" );
                        } else {
                                // Set state as sending
-                               state = jXHR.readyState = 1;
+                               state = jqXHR.readyState = 1;
                                // Send global event
                                if ( s.global ) {
-                                       globalEventContext.trigger( "ajaxSend", [ jXHR, s ] );
+                                       globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
                                }
                                // Timeout
                                if ( s.async && s.timeout > 0 ) {
                                        timeoutTimer = setTimeout( function(){
-                                               jXHR.abort( "timeout" );
+                                               jqXHR.abort( "timeout" );
                                        }, s.timeout );
                                }
 
@@ -679,7 +679,7 @@ jQuery.extend({
                                }
                        }
                }
-               return jXHR;
+               return jqXHR;
        },
 
        // Serialize an array of form elements or a set of
@@ -774,7 +774,7 @@ jQuery.extend({
  * - finds the right dataType (mediates between content-type and expected dataType)
  * - returns the corresponding response
  */
-function ajaxHandleResponses( s, jXHR, responses ) {
+function ajaxHandleResponses( s, jqXHR, responses ) {
 
        var contents = s.contents,
                dataTypes = s.dataTypes,
@@ -787,7 +787,7 @@ function ajaxHandleResponses( s, jXHR, responses ) {
        // Fill responseXXX fields
        for( type in responseFields ) {
                if ( type in responses ) {
-                       jXHR[ responseFields[type] ] = responses[ type ];
+                       jqXHR[ responseFields[type] ] = responses[ type ];
                }
        }
 
@@ -795,7 +795,7 @@ function ajaxHandleResponses( s, jXHR, responses ) {
        while( dataTypes[ 0 ] === "*" ) {
                dataTypes.shift();
                if ( ct === undefined ) {
-                       ct = jXHR.getResponseHeader( "content-type" );
+                       ct = jqXHR.getResponseHeader( "content-type" );
                }
        }
 

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index ebc660fbac8bc35d79b3adc604ae836c4eba7c8b..2691591d2a8c9a585662998db2cdab000a7134ae 100644 (file)
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -12,7 +12,7 @@ jQuery.ajaxSetup({
 });
 
 // Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jXHR ) {
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 
        var dataIsString = ( typeof s.data === "string" );
 
@@ -60,7 +60,7 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jXHR ) {
                };
 
                // Install cleanUp function
-               jXHR.then( cleanUp, cleanUp );
+               jqXHR.then( cleanUp, cleanUp );
 
                // Use data converter to retrieve json after script execution
                s.converters["script json"] = function() {

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index b51419d975c3848c0ede531897976f729570dce5..3041834751d375679170959975c99778cde9a610 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -311,7 +311,7 @@ test("jQuery.ajax() - responseText on error", function() {
        jQuery.ajax({
                url: url("data/errorWithText.php"),
                error: function(xhr) {
-                       strictEqual( xhr.responseText , "plain text message" , "Test jXHR.responseText is filled for HTTP errors" );
+                       strictEqual( xhr.responseText , "plain text message" , "Test jqXHR.responseText is filled for HTTP errors" );
                },
                complete: function() {
                        start();
@@ -1218,9 +1218,9 @@ test("jQuery.get(String, Hash, Function) - parse xml and use text() on nodes", f
 test("jQuery.getScript(String, Function) - with callback", function() {
        expect(3);
        stop();
-       jQuery.getScript(url("data/test.js"), function( data, _, jXHR ) {
+       jQuery.getScript(url("data/test.js"), function( data, _, jqXHR ) {
                equals( foobar, "bar", 'Check if script was evaluated' );
-               strictEqual( data, jXHR.responseText, "Same-domain script requests returns the source of the script (#8082)" );
+               strictEqual( data, jqXHR.responseText, "Same-domain script requests returns the source of the script (#8082)" );
                setTimeout(start, 100);
        });
 });
@@ -1394,8 +1394,8 @@ jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label )
                                        dataType: "jsonp",
                                        crossDomain: crossDomain,
                                        jsonpCallback: "functionToCleanUp",
-                                       beforeSend: function( jXHR ) {
-                                               xhr = jXHR;
+                                       beforeSend: function( jqXHR ) {
+                                               xhr = jqXHR;
                                                return false;
                                        }
                                });
@@ -2072,16 +2072,16 @@ test( "jQuery.ajax - statusCode" , function() {
                }).statusCode( createStatusCodes( "immediately with method" , isSuccess ) );
 
                jQuery.ajax( url( uri ) , {
-                       complete: function(jXHR) {
-                               jXHR.statusCode( createStatusCodes( "on complete" , isSuccess ) );
+                       complete: function(jqXHR) {
+                               jqXHR.statusCode( createStatusCodes( "on complete" , isSuccess ) );
                                countComplete();
                        }
                });
 
                jQuery.ajax( url( uri ) , {
-                       complete: function(jXHR) {
+                       complete: function(jqXHR) {
                                setTimeout( function() {
-                                       jXHR.statusCode( createStatusCodes( "very late binding" , isSuccess ) );
+                                       jqXHR.statusCode( createStatusCodes( "very late binding" , isSuccess ) );
                                        countComplete();
                                } , 100 );
                        }
@@ -2089,10 +2089,10 @@ test( "jQuery.ajax - statusCode" , function() {
 
                jQuery.ajax( url( uri ) , {
                        statusCode: createStatusCodes( "all (options)" , isSuccess ),
-                       complete: function(jXHR) {
-                               jXHR.statusCode( createStatusCodes( "all (on complete)" , isSuccess ) );
+                       complete: function(jqXHR) {
+                               jqXHR.statusCode( createStatusCodes( "all (on complete)" , isSuccess ) );
                                setTimeout( function() {
-                                       jXHR.statusCode( createStatusCodes( "all (very late binding)" , isSuccess ) );
+                                       jqXHR.statusCode( createStatusCodes( "all (very late binding)" , isSuccess ) );
                                        countComplete();
                                } , 100 );
                        }
@@ -2101,22 +2101,22 @@ test( "jQuery.ajax - statusCode" , function() {
                var testString = "";
 
                jQuery.ajax( url( uri ), {
-                       success: function( a , b , jXHR ) {
+                       success: function( a , b , jqXHR ) {
                                ok( isSuccess , "success" );
                                var statusCode = {};
-                               statusCode[ jXHR.status ] = function() {
+                               statusCode[ jqXHR.status ] = function() {
                                        testString += "B";
                                };
-                               jXHR.statusCode( statusCode );
+                               jqXHR.statusCode( statusCode );
                                testString += "A";
                        },
-                       error: function( jXHR ) {
+                       error: function( jqXHR ) {
                                ok( ! isSuccess , "error" );
                                var statusCode = {};
-                               statusCode[ jXHR.status ] = function() {
+                               statusCode[ jqXHR.status ] = function() {
                                        testString += "B";
                                };
-                               jXHR.statusCode( statusCode );
+                               jqXHR.statusCode( statusCode );
                                testString += "A";
                        },
                        complete: function() {