git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More variable renaming to avoid conflicts when module closures are removed.
[jquery.git]
/
src
/
xhr.js
diff --git
a/src/xhr.js
b/src/xhr.js
index
66be463
..
c458704
100644
(file)
--- a/
src/xhr.js
+++ b/
src/xhr.js
@@
-1,6
+1,6
@@
(function( jQuery ) {
(function( jQuery ) {
-var rquery = /\?/,
+var rquery_xhr = /\?/,
rhash = /#.*$/,
rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL
rnoContent = /^(?:GET|HEAD)$/,
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 ) {
// 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
}
// 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
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;
}
s.url = url;