Fixed #2070 by adding a test for !nodeType to isArrayLike so DOM elements like SELECT...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 01ee877..94e0228 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -151,7 +151,7 @@ jQuery.extend({
        lastModified: {},
 
        ajax: function( s ) {
-               var jsonp, jsre = /=(\?|%3F)/g, status, data;
+               var jsonp, jsre = /=\?(&|$)/g, status, data;
 
                // Extend the settings, but re-extend 's' so that it can be
                // checked again later (in the test suite, specifically)
@@ -177,8 +177,8 @@ jQuery.extend({
 
                        // 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);
+                               s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+                       s.url = s.url.replace(jsre, "=" + jsonp + "$1");
 
                        // We need to make sure
                        // that a JSONP style response is executed properly
@@ -192,6 +192,8 @@ jQuery.extend({
                                // Garbage collect
                                window[ jsonp ] = undefined;
                                try{ delete window[ jsonp ]; } catch(e){}
+                               if ( head )
+                                       head.removeChild( script );
                        };
                }
 
@@ -246,7 +248,7 @@ jQuery.extend({
                        head.appendChild(script);
 
                        // We handle everything using the script element injection
-                       return;
+                       return undefined;
                }
 
                var requestDone = false;
@@ -361,9 +363,6 @@ jQuery.extend({
                // firefox 1.5 doesn't fire statechange for sync requests
                if ( !s.async )
                        onreadystatechange();
-               
-               // return XMLHttpRequest to allow aborting the request etc.
-               return xml;
 
                function success(){
                        // If a local callback was specified, fire it and pass it the data
@@ -388,6 +387,9 @@ jQuery.extend({
                        if ( s.global && ! --jQuery.active )
                                jQuery.event.trigger( "ajaxStop" );
                }
+               
+               // return XMLHttpRequest to allow aborting the request etc.
+               return xml;
        },
 
        handleError: function( s, xml, status, e ) {