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

Added a fix for bug #2020 - if you want to do data: {callback: "?"}, do jsonp: "callback" instead.

Browse source
This commit is contained in:
John Resig 2007-12-17 00:44:00 +00:00
parent 45e4a52cdd
commit b721a2f472
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ajax.js
View file

@ -151,7 +151,7 @@ jQuery.extend({
lastModified: {}, lastModified: {},
ajax: function( s ) { 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 // Extend the settings, but re-extend 's' so that it can be
// checked again later (in the test suite, specifically) // checked again later (in the test suite, specifically)

6
test/unit/ajax.js
View file

@ -449,7 +449,7 @@ test("$.ajax() - JSONP, Local", function() {
$.ajax({ $.ajax({
url: "data/jsonp.php", url: "data/jsonp.php",
dataType: "jsonp", dataType: "jsonp",
data: { callback: "?" }, jsonp: "callback",
success: function(data){ success: function(data){
ok( data.data, "JSON results returned (GET, data obj callback)" ); ok( data.data, "JSON results returned (GET, data obj callback)" );
plus(); plus();
@ -492,7 +492,7 @@ test("$.ajax() - JSONP, Local", function() {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "data/jsonp.php", url: "data/jsonp.php",
data: { callback: "?" }, jsonp: "callback",
dataType: "jsonp", dataType: "jsonp",
success: function(data){ success: function(data){
ok( data.data, "JSON results returned (POST, data obj callback)" ); ok( data.data, "JSON results returned (POST, data obj callback)" );
@ -558,7 +558,7 @@ test("$.ajax() - JSONP, Remote", function() {
$.ajax({ $.ajax({
url: base + "data/jsonp.php", url: base + "data/jsonp.php",
dataType: "jsonp", dataType: "jsonp",
data: { callback: "?" }, jsonp: "callback",
success: function(data){ success: function(data){
ok( data.data, "JSON results returned (GET, data obj callback)" ); ok( data.data, "JSON results returned (GET, data obj callback)" );
plus(); plus();