deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
jaubourg 2010-12-11 01:35:46 +01:00
parent 9fa9a57076
commit 2e129759b4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/transports/jsonp.js
View file

@ -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;

6
src/xhr.js
View file

@ -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;