Commit 31949fa5 authored by Dan Heberden's avatar Dan Heberden

Bug 8107; Fix argument handling for $.ajax for multiple method signatues and add test case

parent f43572d3
...@@ -322,9 +322,8 @@ jQuery.extend({ ...@@ -322,9 +322,8 @@ jQuery.extend({
// Main method // Main method
ajax: function( url, options ) { 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; options = url;
url = undefined; url = undefined;
} }
......
...@@ -2161,6 +2161,25 @@ test("jQuery.ajax - active counter", function() { ...@@ -2161,6 +2161,25 @@ test("jQuery.ajax - active counter", function() {
ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active ); 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 });
});
} }
//} //}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment