Ticket #2020: 2020.diff

src/ajax.js

@@ -151 +151 @@
         lastModified: {},
 
         ajax: function( s ) {
-                var jsonp, jsre = /=(\?|%3F)/g, status, data;
+                var jsonp, jsre = /=(\?|%3F)(&|$)/g, status, data;
 
                 // Extend the settings, but re-extend 's' so that it can be
                 // checked again later (in the test suite, specifically)
@@ -177 +177 @@
 
                         // 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 + "$2");
+                        s.url = s.url.replace(jsre, "=" + jsonp + "$2");
 
                         // We need to make sure
                         // that a JSONP style response is executed properly
@@ -192 +192 @@
                                 // Garbage collect
                                 window[ jsonp ] = undefined;
                                 try{ delete window[ jsonp ]; } catch(e){}
+                                if (head)
+                                        head.removeChild( script );
                         };
                 }