Renamed variables to avoid conflicts when Makefile removes internal c…

…losures.
saksoy · Dec 10, 2010 · a500d33 · a500d33
1 parent ab74d8e
commit a500d33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
@@ -2,7 +2,7 @@
 
 var jsc = jQuery.now(),
 	jsre = /\=\?(&|$)/,
-	rquery = /\?/;
+	rquerymark = /\?/;
 
 // 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 += (rquery.test( url ) ? "&" : "?") + jsonp + "=" + jsonpCallback;
+			url = url += (rquerymark.test( url ) ? "&" : "?") + jsonp + "=" + jsonpCallback;
 		}
 
 		s.url = url;

diff --git a/src/xhr.js b/src/xhr.js
@@ -7,11 +7,9 @@ var rquery = /\?/,
 	rts = /([?&])_=[^&]*/,
 	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
 
-	slice = Array.prototype.slice,
+	sliceFunc = Array.prototype.slice,
 
-	isFunction = jQuery.isFunction,
-
-	undefined;
+	isFunction = jQuery.isFunction;
 
 // Creates a jQuery xhr object
 jQuery.xhr = function( _native ) {
@@ -82,7 +80,7 @@ jQuery.xhr = function( _native ) {
 			// Other Variables
 			transportDataType,
 			i;
-
+			
 		// Convert data if not already a string
 		if ( data && s.processData && typeof data != "string" ) {
 			data = s.data = jQuery.param( data , s.traditional );
@@ -602,7 +600,7 @@ jQuery.xhr = function( _native ) {
 	jQuery.each(["bind","unbind"], function(_, name) {
 		xhr[name] = function(type) {
 
-			var functors = slice.call(arguments,1),
+			var functors = sliceFunc.call(arguments,1),
 				list;
 
 			jQuery.each(type.split(/\s+/g), function() {
@@ -647,7 +645,7 @@ function createCBList() {
 				// Remove autoFire to keep bindings in order
 				autoFire = 0;
 
-				var args = slice.call( fireArgs , 2 );
+				var args = sliceFunc.call( fireArgs , 2 );
 
 				// Execute callbacks
 				while ( flag && functors.length ) {