Skip to content
Permalink
Browse files

Backing out fix for #5803 from 3b50eac.

  • Loading branch information
jeresig committed Oct 26, 2010
1 parent 9b97599 commit de58db0cdf4dc08db8683ad6cd0035c5d64b26ac
Showing with 0 additions and 21 deletions.
  1. +0 −6 src/ajax.js
  2. +0 −15 test/unit/ajax.js
@@ -208,12 +208,6 @@ jQuery.extend({
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
if ( s.dataType === "jsonp" ) {
if ( type === "GET" ) {
@@ -825,21 +825,6 @@ test("jQuery.ajax() - JSONP, Local", function() {
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() {

0 comments on commit de58db0

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