Bug 8107; Fix argument handling for $.ajax for multiple method signat…

…ues and add test case
jquery · Feb 1, 2011 · 31949fa · 31949fa
1 parent f43572d
commit 31949fa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/ajax.js b/src/ajax.js
@@ -322,9 +322,8 @@ jQuery.extend({
 	// Main method
 	ajax: function( url, options ) {
 
-		// If options is not an object,
+		// If url is an object, simulate pre-1.5 signature
-		// we simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
-		if ( typeof options !== "object" ) {
 			options = url;
 			url = undefined;
 		}

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
@@ -2161,6 +2161,25 @@ test("jQuery.ajax - active counter", function() {
     ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
 });
 
+test( "jQuery.ajax - multiple method signatures introduced in 1.5 ( #8107)", 4, function() {
+
+	expect( 3 );
+
+	var i = 3;
+
+	jQuery.ajaxSetup({success: function() { 
+		ok( true, "Success");
+		if ( ! --i ) start(); 
+	}});
+
+	stop();
+	jQuery.ajax('data/name.html');
+	jQuery.ajax('data/name.html', {} );
+    jQuery.ajax({ url: 'data/name.html'} );	
+
+	jQuery.ajaxSetup({ success: null });
+});
+
 }
 
 //}