X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=953876a1937e560847e685e1be70a7a19ed6eb1d;hb=c330527318775d32c87954f640c53066e7a732d9;hp=c860b632b250e966997be96afae6f9c1e0059894;hpb=bfdf836da9cf5d0ebd1d6a50c0174bb5b3922d52;p=jquery.git diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index c860b63..953876a 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -11,7 +11,7 @@ jQuery.fn.extend({ * @name loadIfModified * @type jQuery * @param String url The URL of the HTML file to load. - * @param Hash params (optional) A set of key/value pairs that will be sent to the server. + * @param Map params (optional) Key/value pairs that will be sent to the server. * @param Function callback (optional) A function to be executed whenever the data is loaded (parameters: responseText, status and response itself). * @cat AJAX */ @@ -23,6 +23,7 @@ jQuery.fn.extend({ * Load HTML from a remote file and inject it into the DOM. * * Note: Avoid to use this to load scripts, instead use $.getScript. + * IE strips script tags when there aren't any other characters in front of it. * * @example $("#feeds").load("feeds.html"); * @before
@@ -239,17 +240,11 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @param Function callback The function to execute. * @cat AJAX */ - -new function(){ - var e = "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","); - - for ( var i = 0; i < e.length; i++ ) new function(){ - var o = e[i]; - jQuery.fn[o] = function(f){ - return this.bind(o, f); - }; +jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){ + jQuery.fn[o] = function(f){ + return this.bind(o, f); }; -}; +}); jQuery.extend({ @@ -274,7 +269,7 @@ jQuery.extend({ * @name $.get * @type XMLHttpRequest * @param String url The URL of the page to load. - * @param Hash params (optional) A set of key/value pairs that will be sent to the server. + * @param Map params (optional) Key/value pairs that will be sent to the server. * @param Function callback (optional) A function to be executed whenever the data is loaded. * @cat AJAX */ @@ -315,7 +310,7 @@ jQuery.extend({ * @name $.getIfModified * @type XMLHttpRequest * @param String url The URL of the page to load. - * @param Hash params (optional) A set of key/value pairs that will be sent to the server. + * @param Map params (optional) Key/value pairs that will be sent to the server. * @param Function callback (optional) A function to be executed whenever the data is loaded. * @cat AJAX */ @@ -363,7 +358,7 @@ jQuery.extend({ * @name $.getJSON * @type XMLHttpRequest * @param String url The URL of the page to load. - * @param Hash params (optional) A set of key/value pairs that will be sent to the server. + * @param Map params (optional) Key/value pairs that will be sent to the server. * @param Function callback A function to be executed whenever the data is loaded. * @cat AJAX */ @@ -392,7 +387,7 @@ jQuery.extend({ * @name $.post * @type XMLHttpRequest * @param String url The URL of the page to load. - * @param Hash params (optional) A set of key/value pairs that will be sent to the server. + * @param Map params (optional) Key/value pairs that will be sent to the server. * @param Function callback (optional) A function to be executed whenever the data is loaded. * @cat AJAX */ @@ -443,12 +438,14 @@ jQuery.extend({ * global: false, * type: "POST" * } ); + * $.ajax({ data: myData }); * @desc Sets the defaults for AJAX requests to the url "/xmlhttp/", - * disables global handlers and uses POST instead of GET + * disables global handlers and uses POST instead of GET. The following + * AJAX requests then sends some data without having to set anything else. * * @name $.ajaxSetup * @type undefined - * @param Object settings Key/value pairs for ajax options + * @param Map settings Key/value pairs to use for all AJAX requests * @cat AJAX */ ajaxSetup: function(settings) { @@ -583,8 +580,9 @@ jQuery.extend({ * * @name $.ajax * @type XMLHttpRequest - * @param Hash prop A set of properties to initialize the request with. + * @param Map properties Key/value pairs to initialize the request with. * @cat AJAX + * @see ajaxSetup(Map) */ ajax: function( s ) { // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout @@ -714,6 +712,10 @@ jQuery.extend({ jQuery.handleError(s, xml, null, e); } + // firefox 1.5 doesn't fire statechange for sync requests + if(!s.async) + onreadystatechange(); + // return XMLHttpRequest to allow aborting the request etc. return xml2; },