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

Added a fix for bug #1580, where the query string was appended to the POST data, instead of being left alone.

Browse source
This commit is contained in:
John Resig 2007-09-15 01:18:30 +00:00
parent d9a3b133f1
commit 62d84e44ac
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/ajax.js
View file

@ -163,24 +163,24 @@ jQuery.extend({
if ( s.data && s.processData && typeof s.data != "string" ) if ( s.data && s.processData && typeof s.data != "string" )
s.data = jQuery.param(s.data); s.data = jQuery.param(s.data);
// Break the data into one single string
var q = s.url.indexOf("?");
if ( q > -1 ) {
s.data = (s.data ? s.data + "&" : "") + s.url.slice(q + 1);
s.url = s.url.slice(0, q);
}
// Handle JSONP Parameter Callbacks // Handle JSONP Parameter Callbacks
if ( s.dataType == "jsonp" ) { if ( s.dataType == "jsonp" ) {
if ( !s.data || !s.data.match(jsre) ) if ( s.type.toLowerCase() == "get" ) {
if ( !s.url.match(jsre) )
s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
} else if ( !s.data || !s.data.match(jsre) )
s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?"; s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
s.dataType = "json"; s.dataType = "json";
} }
// Build temporary JSONP function // Build temporary JSONP function
if ( s.dataType == "json" && s.data && s.data.match(jsre) ) { if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
jsonp = "jsonp" + jsc++; jsonp = "jsonp" + jsc++;
// Replace the =? sequence both in the query string and the data
if ( s.data )
s.data = s.data.replace(jsre, "=" + jsonp); s.data = s.data.replace(jsre, "=" + jsonp);
s.url = s.url.replace(jsre, "=" + jsonp);
// We need to make sure // We need to make sure
// that a JSONP style response is executed properly // that a JSONP style response is executed properly
@ -201,11 +201,11 @@ jQuery.extend({
s.cache = false; s.cache = false;
if ( s.cache === false && s.type.toLowerCase() == "get" ) if ( s.cache === false && s.type.toLowerCase() == "get" )
s.data = (s.data ? s.data + "&" : "") + "_=" + (new Date()).getTime(); s.url += (s.url.match(/\?/) ? "&" : "?") + "_=" + (new Date()).getTime();
// If data is available, append data to url for get requests // If data is available, append data to url for get requests
if ( s.data && s.type.toLowerCase() == "get" ) { if ( s.data && s.type.toLowerCase() == "get" ) {
s.url += "?" + s.data; s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
// IE likes to send both get and post data, prevent this // IE likes to send both get and post data, prevent this
s.data = null; s.data = null;

9
test/unit/ajax.js
View file

@ -516,13 +516,20 @@ test("$.getJSON(String, Function) - JSON object", function() {
}); });
test("$.post(String, Hash, Function) - simple with xml", function() { test("$.post(String, Hash, Function) - simple with xml", function() {
expect(2); expect(4);
stop(); stop();
$.post(url("data/name.php"), {xml: "5-2"}, function(xml){ $.post(url("data/name.php"), {xml: "5-2"}, function(xml){
$('math', xml).each(function() { $('math', xml).each(function() {
ok( $('calculation', this).text() == '5-2', 'Check for XML' ); ok( $('calculation', this).text() == '5-2', 'Check for XML' );
ok( $('result', this).text() == '3', 'Check for XML' ); ok( $('result', this).text() == '3', 'Check for XML' );
}); });
});
$.post(url("data/name.php?xml=5-2"), {}, function(xml){
$('math', xml).each(function() {
ok( $('calculation', this).text() == '5-2', 'Check for XML' );
ok( $('result', this).text() == '3', 'Check for XML' );
});
start(); start();
}); });
}); });