X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=fa48afab57b1134ad1719ab9312f889f3b11e604;hb=010a112e048f932aff7feeb9987eec7a64e5328b;hp=4df372bfc0ea2bce573a60491163ff47f9f08869;hpb=12d13d9adaea1139b0928180c17aa83eef5d5c6a;p=jquery.git diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index 4df372b..fa48afa 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -170,7 +170,10 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) /** * Attach a function to be executed whenever an AJAX request completes. * - * @example $("#msg").ajaxComplete(function(){ + * The XMLHttpRequest and settings used for that request are passed + * as arguments to the callback. + * + * @example $("#msg").ajaxComplete(function(request, settings){ * $(this).append("
  • Request Complete.
  • "); * }); * @desc Show a message when an AJAX request completes. @@ -185,7 +188,10 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * Attach a function to be executed whenever an AJAX request completes * successfully. * - * @example $("#msg").ajaxSuccess(function(){ + * The XMLHttpRequest and settings used for that request are passed + * as arguments to the callback. + * + * @example $("#msg").ajaxSuccess(function(request, settings){ * $(this).append("
  • Successful Request!
  • "); * }); * @desc Show a message when an AJAX request completes successfully. @@ -199,8 +205,11 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) /** * Attach a function to be executed whenever an AJAX request fails. * - * @example $("#msg").ajaxError(function(){ - * $(this).append("
  • Error requesting page.
  • "); + * The XMLHttpRequest and settings used for that request are passed + * as arguments to the callback. + * + * @example $("#msg").ajaxError(function(request, settings){ + * $(this).append("
  • Error requesting page " + settings.url + "
  • "); * }); * @desc Show a message when an AJAX request fails. * @@ -209,9 +218,26 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @param Function callback The function to execute. * @cat AJAX */ + +/** + * Attach a function to be executed before an AJAX request is send. + * + * The XMLHttpRequest and settings used for that request are passed + * as arguments to the callback. + * + * @example $("#msg").ajaxSend(function(request, settings){ + * $(this).append("
  • Starting request at " + settings.url + "
  • "); + * }); + * @desc Show a message before an AJAX request is send. + * + * @name ajaxSend + * @type jQuery + * @param Function callback The function to execute. + * @cat AJAX + */ new function(){ - var e = "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess".split(","); + var e = "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","); for ( var i = 0; i < e.length; i++ ) new function(){ var o = e[i]; @@ -570,6 +596,8 @@ jQuery.extend({ // Allow custom headers/mimetypes if( s.beforeSend ) s.beforeSend(xml); + if (s.global) + jQuery.event.trigger("ajaxSend", [xml, s]); // Wait for a response to come back var onreadystatechange = function(isTimeout){ @@ -600,7 +628,7 @@ jQuery.extend({ // Fire the global callback if( s.global ) - jQuery.event.trigger( "ajaxSuccess" ); + jQuery.event.trigger( "ajaxSuccess", [xml, s] ); // Otherwise, the request was not successful } else { @@ -609,12 +637,12 @@ jQuery.extend({ // Fire the global callback if( s.global ) - jQuery.event.trigger( "ajaxError" ); + jQuery.event.trigger( "ajaxError", [xml, s] ); } // The request was completed if( s.global ) - jQuery.event.trigger( "ajaxComplete" ); + jQuery.event.trigger( "ajaxComplete", [xml, s] ); // Handle the global AJAX counter if ( s.global && ! --jQuery.active )