Changeset 3295

Timestamp:

09/15/07 01:18:30 (1 year ago)

Author:

jeresig

Message:

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

Location:

trunk/jquery

Files:

• src/ajax.js (modified) (3 diffs)
• test/unit/ajax.js (modified) (1 diff)

trunk/jquery/src/ajax.js

@@ -164 +164 @@
             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";
@@ -179 +175 @@
 
         // 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
@@ -202 +202 @@
 
         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

trunk/jquery/test/unit/ajax.js

@@ -517 +517 @@
 
 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' );