Added a fix for bug #1580, where the query string was appended to the POST data,...

diff --git a/src/ajax.js b/src/ajax.js
index a0bcf55f7696ad8bc3aca923770df877e5e6f2a0..f401c85380eb2c248de9793032a289ce87f29b5f 100644 (file)
--- a/src/ajax.js
+++ b/src/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;

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 22caf2ac07812ad27e5f285314737452cb79fd40..1e1e8123a9dfe429ed3e7cbf2562ac15e068a92b 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -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();
        });
 });