From a519129e99ba03770e9290961d43fad9f6873a83 Mon Sep 17 00:00:00 2001 From: jaubourg Date: Fri, 15 Apr 2011 14:16:43 -0700 Subject: [PATCH] Removes now unnecessary regexp and companion function. Fixes some spacing issues. Shortens field names. --- src/ajax.js | 18 +++++++----------- src/ajax/xhr.js | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/ajax.js b/src/ajax.js index e9f070abdb..3048068d04 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -15,10 +15,6 @@ var r20 = /%20/g, rselectTextarea = /^(?:select|textarea)/i, rspacesAjax = /\s+/, rts = /([?&])_=[^&]*/, - rucHeaders = /(^|\-)([a-z])/g, - rucHeadersFunc = function( _, $1, $2 ) { - return $1 + $2.toUpperCase(); - }, rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/, // Keep a copy of the old load method @@ -416,7 +412,7 @@ jQuery.extend({ // Caches the header setRequestHeader: function( name, value ) { if ( !state ) { - requestHeaders[ name.toUpperCase().replace( rucHeaders, rucHeadersFunc ) ] = { name: name, value: value }; + requestHeaders[ name.toLowerCase() ] = { n: name, v: value }; } return this; }, @@ -679,12 +675,12 @@ jQuery.extend({ } // Set the Accepts header for the server, depending on the dataType - jqXHR.setRequestHeader( - "Accept", - s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ? - s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) : - s.accepts[ "*" ] - ); + jqXHR.setRequestHeader( + "Accept", + s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ? + s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) : + s.accepts[ "*" ] + ); // Check for headers option for ( i in s.headers ) { diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js index 0c837c5aa4..ba4c3ec7e4 100644 --- a/src/ajax/xhr.js +++ b/src/ajax/xhr.js @@ -104,7 +104,7 @@ if ( jQuery.support.ajax ) { // Need an extra try/catch for cross domain requests in Firefox 3 try { for ( i in headers ) { - xhr.setRequestHeader( headers[ i ].name, headers[ i ].value ); + xhr.setRequestHeader( headers[ i ].n, headers[ i ].v ); } } catch( _ ) {}