Fixes #8054 by reverting feature enhancement 5812 (4920). Regexps no longer searches for %3F in url or data to find jsonp callback placeholders.
This commit is contained in:
parent
5ca8f0617f
commit
325dcdc2ab
2 changed files with 3 additions and 20 deletions
|
@ -1,7 +1,7 @@
|
||||||
(function( jQuery ) {
|
(function( jQuery ) {
|
||||||
|
|
||||||
var jsc = jQuery.now(),
|
var jsc = jQuery.now(),
|
||||||
jsre = /(\=)(?:\?|%3F)(&|$)|()(?:\?\?|%3F%3F)()/i;
|
jsre = /(\=)\?(&|$)|()\?\?()/i;
|
||||||
|
|
||||||
// Default jsonp settings
|
// Default jsonp settings
|
||||||
jQuery.ajaxSetup({
|
jQuery.ajaxSetup({
|
||||||
|
|
|
@ -1199,10 +1199,10 @@ test("jQuery.getScript(String, Function) - no callback", function() {
|
||||||
jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) {
|
jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) {
|
||||||
|
|
||||||
test("jQuery.ajax() - JSONP, " + label, function() {
|
test("jQuery.ajax() - JSONP, " + label, function() {
|
||||||
expect(17);
|
expect(16);
|
||||||
|
|
||||||
var count = 0;
|
var count = 0;
|
||||||
function plus(){ if ( ++count == 17 ) start(); }
|
function plus(){ if ( ++count == 16 ) start(); }
|
||||||
|
|
||||||
stop();
|
stop();
|
||||||
|
|
||||||
|
@ -1306,23 +1306,6 @@ jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label )
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
jQuery.ajax({
|
|
||||||
url: "data/jsonp.php",
|
|
||||||
dataType: "jsonp",
|
|
||||||
crossDomain: crossDomain,
|
|
||||||
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({
|
jQuery.ajax({
|
||||||
url: "data/jsonp.php",
|
url: "data/jsonp.php",
|
||||||
dataType: "jsonp",
|
dataType: "jsonp",
|
||||||
|
|
Loading…
Reference in a new issue