From 8c8bd3bf6ac982f98c1b89b0af74a1fd2d07e360 Mon Sep 17 00:00:00 2001 From: jaubourg Date: Sun, 9 Jan 2011 21:48:52 +0100 Subject: [PATCH] =?utf8?q?Fixes=20#5812.=20=3D=3F=20will=20be=20detected=20e?= =?utf8?q?ven=20when=20it=20has=20been=20escaped=20during=20data=20serializa?= =?utf8?q?tion.?= --- src/ajax/jsonp.js | 2 +- test/unit/ajax.js | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js index 0af0056..f4b324e 100644 --- a/src/ajax/jsonp.js +++ b/src/ajax/jsonp.js @@ -1,7 +1,7 @@ (function( jQuery ) { var jsc = jQuery.now(), - jsre = /\=\?(&|$)/, + jsre = /\=(?:\?|%3F)(&|$)/i, rquery_jsonp = /\?/; // Default jsonp settings diff --git a/test/unit/ajax.js b/test/unit/ajax.js index d849cff..773088f 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -1081,7 +1081,7 @@ test("jQuery.getScript(String, Function) - no callback", function() { }); test("jQuery.ajax() - JSONP, Local", function() { - expect(9); + expect(10); var count = 0; function plus(){ if ( ++count == 9 ) start(); } @@ -1131,6 +1131,22 @@ test("jQuery.ajax() - JSONP, Local", function() { jQuery.ajax({ url: "data/jsonp.php", dataType: "jsonp", + data: { + callback: "?" + }, + success: function(data){ + ok( data.data, "JSON results returned (GET, processed data callback)" ); + plus(); + }, + error: function(data){ + ok( false, "Ajax error JSON (GET, processed data callback)" ); + plus(); + } + }); + + jQuery.ajax({ + url: "data/jsonp.php", + dataType: "jsonp", jsonp: "callback", success: function(data){ ok( data.data, "JSON results returned (GET, data obj callback)" ); -- 1.7.10.4