Skip to content
Permalink
Browse files

Added a fix for bug #1580, where the query string was appended to the…

… POST data, instead of being left alone.
  • Loading branch information
jeresig committed Sep 15, 2007
1 parent d9a3b13 commit 62d84e44ac3b4a3673c320514bbf5ac8dc7712d6
Showing with 20 additions and 13 deletions.
  1. +12 −12 src/ajax.js
  2. +8 −1 test/unit/ajax.js
@@ -163,24 +163,24 @@ jQuery.extend({
if ( s.data && s.processData && typeof s.data != "string" )
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
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.dataType = "json";
}

// 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++;
s.data = s.data.replace(jsre, "=" + jsonp);

// Replace the =? sequence both in the query string and the data
if ( s.data )
s.data = s.data.replace(jsre, "=" + jsonp);
s.url = s.url.replace(jsre, "=" + jsonp);

// We need to make sure
// that a JSONP style response is executed properly
@@ -201,11 +201,11 @@ jQuery.extend({
s.cache = false;

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 ( 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
s.data = null;
@@ -516,13 +516,20 @@ test("$.getJSON(String, Function) - JSON object", function() {
});

test("$.post(String, Hash, Function) - simple with xml", function() {
expect(2);
expect(4);
stop();
$.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' );
});
});

$.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();
});
});

0 comments on commit 62d84e4

Please sign in to comment.
You can’t perform that action at this time.