Renamed variables to avoid conflicts when Makefile removes internal closures.

[jquery.git] / src / xhr.js

diff --git a/src/xhr.js b/src/xhr.js
index fae1110..66be463 100644 (file)
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -1,4 +1,4 @@
-(function( jQuery , undefined ) {
+(function( jQuery ) {
 
 var rquery = /\?/,
        rhash = /#.*$/,
@@ -7,7 +7,7 @@ var rquery = /\?/,
        rts = /([?&])_=[^&]*/,
        rurl = /^(\w+:)?\/\/([^\/?#]+)/,
        
-       slice = Array.prototype.slice,
+       sliceFunc = Array.prototype.slice,
        
        isFunction = jQuery.isFunction;
        
@@ -80,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 );
@@ -147,8 +147,8 @@ jQuery.xhr = function( _native ) {
                                accepts[ "*" ];
                                
                        // Check for headers option
-                       if ( headers ) {
-                               xhr.setRequestHeaders( headers );
+                       for ( i in headers ) {
+                               requestHeaders[ i.toLowerCase() ] = headers[ i ];
                        }                       
                }
                        
@@ -554,21 +554,6 @@ jQuery.xhr = function( _native ) {
                                return xhr;
                        },
                        
-                       // Ditto with an s
-                       setRequestHeaders: function(map) {
-                               checkState(1, !sendFlag);
-                               for ( var name in map ) {
-                                       requestHeaders[ name.toLowerCase() ] = map[name];
-                               }
-                               return xhr;
-                       },
-                       
-                       // Utility method to get headers set
-                       getRequestHeader: function(name) {
-                               checkState(1, !sendFlag);
-                               return requestHeaders[ name.toLowerCase() ];
-                       },
-                       
                        // Raw string
                        getAllResponseHeaders: function() {
                                return xhr.readyState <= 1 ? "" : responseHeadersString;
@@ -615,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() {
@@ -660,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 ) {
@@ -938,4 +923,4 @@ function determineDataType( s , ct , text , xml ) {
        return response;
 }      
 
-})(jQuery);
+})( jQuery );