jquery ajax: support for dynamic data arguments, see #2806; added test/data/echoQuery...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 01ee877..b90ca16 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -91,7 +91,7 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp
        };
 });
 
-var jsc = (new Date).getTime();
+var jsc = now();
 
 jQuery.extend({
        get: function( url, data, callback, type ) {
@@ -144,14 +144,24 @@ jQuery.extend({
                contentType: "application/x-www-form-urlencoded",
                processData: true,
                async: true,
-               data: null
+               data: null,
+               username: null,
+               password: null,
+               accepts: {
+                       xml: "application/xml, text/xml",
+                       html: "text/html",
+                       script: "text/javascript, application/javascript",
+                       json: "application/json, text/javascript",
+                       text: "text/plain",
+                       _default: "*/*"
+               }
        },
        
        // Last-Modified header cache for next request
        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 +187,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 +202,8 @@ jQuery.extend({
                                // Garbage collect
                                window[ jsonp ] = undefined;
                                try{ delete window[ jsonp ]; } catch(e){}
+                               if ( head )
+                                       head.removeChild( script );
                        };
                }
 
@@ -199,7 +211,7 @@ jQuery.extend({
                        s.cache = false;
 
                if ( s.cache === false && s.type.toLowerCase() == "get" ) {
-                       var ts = (new Date()).getTime();
+                       var ts = now();
                        // try replacing _= if it is there
                        var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
                        // if nothing was replaced, add timestamp to the end
@@ -220,7 +232,7 @@ jQuery.extend({
 
                // If we're requesting a remote document
                // and trying to load JSON or Script with a GET
-               if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && ( s.dataType == "script" || s.dataType =="json" ) && s.type.toLowerCase() == "get" ) {
+               if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) {
                        var head = document.getElementsByTagName("head")[0];
                        var script = document.createElement("script");
                        script.src = s.url;
@@ -246,7 +258,7 @@ jQuery.extend({
                        head.appendChild(script);
 
                        // We handle everything using the script element injection
-                       return;
+                       return undefined;
                }
 
                var requestDone = false;
@@ -256,7 +268,7 @@ jQuery.extend({
                var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
 
                // Open the socket
-               xml.open(s.type, s.url, s.async);
+               xml.open(s.type, s.url, s.async, s.username, s.password);
 
                // Need an extra try/catch for cross domain requests in Firefox 3
                try {
@@ -271,12 +283,22 @@ jQuery.extend({
 
                        // Set header so the called script knows that it's an XMLHttpRequest
                        xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+                       // Set the Accepts header for the server, depending on the dataType
+                       xml.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+                               s.accepts[ s.dataType ] + ", */*" :
+                               s.accepts._default );
                } catch(e){}
 
                // Allow custom headers/mimetypes
-               if ( s.beforeSend )
-                       s.beforeSend(xml);
-                       
+               if ( s.beforeSend && s.beforeSend(xml, s) === false ) {
+                       // cleanup active request counter
+                       s.global && jQuery.active--;
+                       // close opended socket
+                       xml.abort();
+                       return false;
+               }
+               
                if ( s.global )
                        jQuery.event.trigger("ajaxSend", [xml, s]);
 
@@ -361,9 +383,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 +407,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 ) {
@@ -426,9 +448,9 @@ jQuery.extend({
        },
 
        httpData: function( r, type ) {
-               var ct = r.getResponseHeader("content-type");
-               var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0;
-               var data = xml ? r.responseXML : r.responseText;
+               var ct = r.getResponseHeader("content-type"),
+                       xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0,
+                       data = xml ? r.responseXML : r.responseText;
 
                if ( xml && data.documentElement.tagName == "parsererror" )
                        throw "parsererror";
@@ -467,7 +489,7 @@ jQuery.extend({
                                                s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
                                        });
                                else
-                                       s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) );
+                                       s.push( encodeURIComponent(j) + "=" + encodeURIComponent( jQuery.isFunction(a[j]) ? a[j]() : a[j] ) );
 
                // Return the resulting serialization
                return s.join("&").replace(/%20/g, "+");