deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Backing out fix for #5803 from 3b50eaca2c.

Browse source
This commit is contained in:
John Resig 2010-10-25 17:54:27 -07:00
parent 9b97599fa4
commit de58db0cdf
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ajax.js
View file

@ -208,12 +208,6 @@ jQuery.extend({
s.data = jQuery.param( s.data, s.traditional ); s.data = jQuery.param( s.data, s.traditional );
} }
// If the jsonpCallback has been set, we can assume that dataType is jsonp
// Ticket #5803
if ( s.jsonpCallback ) {
s.dataType = "jsonp";
}
// Handle JSONP Parameter Callbacks // Handle JSONP Parameter Callbacks
if ( s.dataType === "jsonp" ) { if ( s.dataType === "jsonp" ) {
if ( type === "GET" ) { if ( type === "GET" ) {

15
test/unit/ajax.js
View file

@ -825,21 +825,6 @@ test("jQuery.ajax() - JSONP, Local", function() {
plus(); plus();
} }
}); });
// Supports Ticket #5803
jQuery.ajax({
url: "data/jsonp.php",
jsonpCallback: "jsonpResults",
success: function(data){
ok( data.data, "JSON results returned without dataType:jsonp when jsonpCallback is defined" );
plus();
},
error: function(data){
ok( false, "Ajax error JSON (GET, custom callback name)" );
plus();
}
});
}); });
test("JSONP - Custom JSONP Callback", function() { test("JSONP - Custom JSONP Callback", function() {