git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45e4a52
)
Added a fix for bug #2020 - if you want to do data: {callback: "?"}, do jsonp: "callb...
author
John Resig
<jeresig@gmail.com>
Mon, 17 Dec 2007 00:44:00 +0000
(
00:44
+0000)
committer
John Resig
<jeresig@gmail.com>
Mon, 17 Dec 2007 00:44:00 +0000
(
00:44
+0000)
src/ajax.js
patch
|
blob
|
history
test/unit/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax.js
b/src/ajax.js
index
6628b1f
..
bf3c238
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-151,7
+151,7
@@
jQuery.extend({
lastModified: {},
ajax: function( s ) {
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)
// 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
(file)
--- 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",
$.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();
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",
$.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)" );
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",
$.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();
success: function(data){
ok( data.data, "JSON results returned (GET, data obj callback)" );
plus();