Skip to content
Permalink
Browse files

Revises the way arguments are handled in ajax.

  • Loading branch information
jaubourg committed Jan 20, 2011
1 parent 9ab00a7 commit 3e1d3d0f21d1b292fe721b4f483b3a3bc2dadd86
Showing with 6 additions and 7 deletions.
  1. +6 −7 src/ajax.js
@@ -291,18 +291,16 @@ jQuery.extend({
// Main method
ajax: function( url , options ) {

// Handle varargs
if ( arguments.length === 1 ) {
// If options is not an object,
// we simulate pre-1.5 signature
if ( typeof( options ) !== "object" ) {
options = url;
url = options ? options.url : undefined;
url = undefined;
}

// Force options to be an object
options = options || {};

// Get the url if provided separately
options.url = url || options.url;

var // Create the final options object
s = jQuery.extend( true , {} , jQuery.ajaxSettings , options ),
// jQuery lists
@@ -630,7 +628,8 @@ jQuery.extend({
};

// Remove hash character (#7531: and string promotion)
s.url = ( "" + s.url ).replace( rhash , "" );
// We also use the url parameter if available
s.url = ( "" + ( url || s.url ) ).replace( rhash , "" );

// Extract dataTypes list
s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( /\s+/ );

0 comments on commit 3e1d3d0

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