More variable renaming to avoid conflicts when module closures are removed.

diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index d73781f5c7b7b7e3a3b2be31b95ab2d2c6e0186a..d9e77f2f381cde0eeeb9a7882e5b9a6e83eea5e4 100644 (file)
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -2,7 +2,7 @@
 
 var jsc = jQuery.now(),
        jsre = /\=\?(&|$)/,
-       rquerymark = /\?/;
+       rquery_jsonp = /\?/;
 
 // Default jsonp callback name
 jQuery.ajaxSettings.jsonpCallback = function() {
@@ -29,7 +29,7 @@ jQuery.xhr.prefilter( function(s) {
                        data = s.url == url && typeof(s.data) === "string" ? s.data.replace(jsre, "=" + jsonpCallback + "$1") : s.data;
                        
                if ( url == s.url && data == s.data ) {
-                       url = url += (rquerymark.test( url ) ? "&" : "?") + jsonp + "=" + jsonpCallback;
+                       url = url += (rquery_jsonp.test( url ) ? "&" : "?") + jsonp + "=" + jsonpCallback;
                }
                
                s.url = url;

diff --git a/src/xhr.js b/src/xhr.js
index 66be46362b84a1e8d03b3b2e39ed3ccba3d65c04..c458704eeabaeb78caa1fe615fd7b7c740e10d5d 100644 (file)
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -1,6 +1,6 @@
 (function( jQuery ) {
 
-var rquery = /\?/,
+var rquery_xhr = /\?/,
        rhash = /#.*$/,
        rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL
        rnoContent = /^(?:GET|HEAD)$/,
@@ -109,7 +109,7 @@ jQuery.xhr = function( _native ) {
                                
                                // If data is available, append data to url
                                if ( data ) {
-                                       url += (rquery.test(url) ? "&" : "?") + data;
+                                       url += (rquery_xhr.test(url) ? "&" : "?") + data;
                                }
                                                                
                                // Add anti-cache in url if needed
@@ -120,7 +120,7 @@ jQuery.xhr = function( _native ) {
                                                ret = url.replace(rts, "$1_=" + ts );
                                                
                                        // if nothing was replaced, add timestamp to the end
-                                       url = ret + ((ret == url) ? (rquery.test(url) ? "&" : "?") + "_=" + ts : "");
+                                       url = ret + ((ret == url) ? (rquery_xhr.test(url) ? "&" : "?") + "_=" + ts : "");
                                }
                                
                                s.url = url;