Skip to content
Permalink
Browse files
Added a fix for bug #2020 - if you want to do data: {callback: "?"}, …
…do jsonp: "callback" instead.
  • Loading branch information
jeresig committed Dec 17, 2007
1 parent 45e4a52 commit b721a2f472b53fec28276d2080d741cf070b686d
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/ajax.js
  2. +3 −3 test/unit/ajax.js
@@ -151,7 +151,7 @@ jQuery.extend({
lastModified: {},

ajax: function( s ) {
var jsonp, jsre = /=(\?|%3F)/g, status, data;
var jsonp, jsre = /=\?(&|$)/g, status, data;

// Extend the settings, but re-extend 's' so that it can be
// checked again later (in the test suite, specifically)
@@ -449,7 +449,7 @@ test("$.ajax() - JSONP, Local", function() {
$.ajax({
url: "data/jsonp.php",
dataType: "jsonp",
data: { callback: "?" },
jsonp: "callback",
success: function(data){
ok( data.data, "JSON results returned (GET, data obj callback)" );
plus();
@@ -492,7 +492,7 @@ test("$.ajax() - JSONP, Local", function() {
$.ajax({
type: "POST",
url: "data/jsonp.php",
data: { callback: "?" },
jsonp: "callback",
dataType: "jsonp",
success: function(data){
ok( data.data, "JSON results returned (POST, data obj callback)" );
@@ -558,7 +558,7 @@ test("$.ajax() - JSONP, Remote", function() {
$.ajax({
url: base + "data/jsonp.php",
dataType: "jsonp",
data: { callback: "?" },
jsonp: "callback",
success: function(data){
ok( data.data, "JSON results returned (GET, data obj callback)" );
plus();

0 comments on commit b721a2f

Please sign in to comment.