X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=814a6b85e423f1477c550501a3dcfbc3d05fc3fc;hb=fade976946fba8a9c9782bbbc56058fdc238b31f;hp=9c94e13d38f8c6e0f9c2c8da7aacd6e65100a248;hpb=32f688d303ed3cbb942df421c5bb2ed7a5d5244c;p=jquery.git diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index 9c94e13..814a6b8 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -391,6 +391,11 @@ jQuery.extend({ * @cat Ajax */ post: function( url, data, callback, type ) { + if ( jQuery.isFunction( data ) ) { + callback = data; + data = {}; + } + return jQuery.ajax({ type: "POST", url: url, @@ -594,9 +599,12 @@ jQuery.extend({ if (s.processData && typeof s.data != "string") s.data = jQuery.param(s.data); // append data to url for get requests - if( s.type.toLowerCase() == "get" ) + if( s.type.toLowerCase() == "get" ) { // "?" + data or "&" + data (in case there are already params) s.url += ((s.url.indexOf("?") > -1) ? "&" : "?") + s.data; + // IE likes to send both get and post data, prevent this + s.data = null; + } } // Watch for a new set of requests @@ -639,6 +647,13 @@ jQuery.extend({ // The transfer is complete and the data is available, or the request timed out if ( xml && (xml.readyState == 4 || isTimeout == "timeout") ) { requestDone = true; + + // clear poll interval + if (ival) { + clearInterval(ival); + ival = null; + } + var status; try { status = jQuery.httpSuccess( xml ) && isTimeout != "timeout" ? @@ -684,11 +699,13 @@ jQuery.extend({ s.complete(xml, status); // Stop memory leaks - xml.onreadystatechange = function(){}; - xml = null; + if(s.async) + xml = null; } }; - xml.onreadystatechange = onreadystatechange; + + // don't attach the handler to the request, just poll it instead + var ival = setInterval(onreadystatechange, 13); // Timeout checker if ( s.timeout > 0 ) @@ -703,12 +720,9 @@ jQuery.extend({ } }, s.timeout); - // save non-leaking reference - var xml2 = xml; - // Send the data try { - xml2.send(s.data); + xml.send(s.data); } catch(e) { jQuery.handleError(s, xml, null, e); } @@ -718,7 +732,7 @@ jQuery.extend({ onreadystatechange(); // return XMLHttpRequest to allow aborting the request etc. - return xml2; + return xml; }, handleError: function( s, xml, status, e ) { @@ -799,7 +813,7 @@ jQuery.extend({ // Serialize the key/values for ( var j in a ) // If the value is an array then the key names need to be repeated - if ( a[j].constructor == Array ) + if ( a[j] && a[j].constructor == Array ) jQuery.each( a[j], function(){ s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) ); });