From: John Resig <jeresig@gmail.com>
Date: Mon, 17 Dec 2007 00:44:00 +0000 (+0000)
Subject: Added a fix for bug #2020 - if you want to do data: {callback: "?"}, do jsonp: "callb... 
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=b721a2f472b53fec28276d2080d741cf070b686d;p=jquery.git

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

diff --git a/src/ajax.js b/src/ajax.js
index 6628b1f..bf3c238 100644
--- a/src/ajax.js
+++ b/src/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)
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index c231673..8dcf759 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -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();