Skip to content
Permalink
Browse files

Removes now unnecessary regexp and companion function. Fixes some spa…

…cing issues. Shortens field names.
  • Loading branch information...
jaubourg committed Apr 15, 2011
1 parent 4d3cb7d commit a519129e99ba03770e9290961d43fad9f6873a83
Showing with 8 additions and 12 deletions.
  1. +7 −11 src/ajax.js
  2. +1 −1 src/ajax/xhr.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 ) {
@@ -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( _ ) {}

0 comments on commit a519129

Please sign in to comment.
You can’t perform that action at this time.