deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed #471

Browse source
This commit is contained in:
Jörn Zaefferer 2006-12-11 08:53:33 +00:00
parent 12d13d9ada
commit 010a112e04
2 changed files with 58 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/ajax/ajax.js
View file

@ -170,7 +170,10 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
/** /**
* Attach a function to be executed whenever an AJAX request completes. * 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("<li>Request Complete.</li>"); * $(this).append("<li>Request Complete.</li>");
* }); * });
* @desc Show a message when an AJAX request completes. * @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 * Attach a function to be executed whenever an AJAX request completes
* successfully. * 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("<li>Successful Request!</li>"); * $(this).append("<li>Successful Request!</li>");
* }); * });
* @desc Show a message when an AJAX request completes successfully. * @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. * Attach a function to be executed whenever an AJAX request fails.
* *
* @example $("#msg").ajaxError(function(){ * The XMLHttpRequest and settings used for that request are passed
* $(this).append("<li>Error requesting page.</li>"); * as arguments to the callback.
*
* @example $("#msg").ajaxError(function(request, settings){
* $(this).append("<li>Error requesting page " + settings.url + "</li>");
* }); * });
* @desc Show a message when an AJAX request fails. * @desc Show a message when an AJAX request fails.
* *
@ -210,8 +219,25 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
* @cat AJAX * @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("<li>Starting request at " + settings.url + "</li>");
* });
* @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(){ 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(){ for ( var i = 0; i < e.length; i++ ) new function(){
var o = e[i]; var o = e[i];
@ -570,6 +596,8 @@ jQuery.extend({
// Allow custom headers/mimetypes // Allow custom headers/mimetypes
if( s.beforeSend ) if( s.beforeSend )
s.beforeSend(xml); s.beforeSend(xml);
if (s.global)
jQuery.event.trigger("ajaxSend", [xml, s]);
// Wait for a response to come back // Wait for a response to come back
var onreadystatechange = function(isTimeout){ var onreadystatechange = function(isTimeout){
@ -600,7 +628,7 @@ jQuery.extend({
// Fire the global callback // Fire the global callback
if( s.global ) if( s.global )
jQuery.event.trigger( "ajaxSuccess" ); jQuery.event.trigger( "ajaxSuccess", [xml, s] );
// Otherwise, the request was not successful // Otherwise, the request was not successful
} else { } else {
@ -609,12 +637,12 @@ jQuery.extend({
// Fire the global callback // Fire the global callback
if( s.global ) if( s.global )
jQuery.event.trigger( "ajaxError" ); jQuery.event.trigger( "ajaxError", [xml, s] );
} }
// The request was completed // The request was completed
if( s.global ) if( s.global )
jQuery.event.trigger( "ajaxComplete" ); jQuery.event.trigger( "ajaxComplete", [xml, s] );
// Handle the global AJAX counter // Handle the global AJAX counter
if ( s.global && ! --jQuery.active ) if ( s.global && ! --jQuery.active )

36
src/ajax/ajaxTest.js
View file

@ -55,47 +55,55 @@ test("load(String, Object, Function) - check scripts", function() {
}); });
test("test global handlers - success", function() { test("test global handlers - success", function() {
expect(6); expect(8);
stop(); stop();
var counter = { complete: 0, success: 0, error: 0 }, var counter = { complete: 0, success: 0, error: 0, send: 0 },
success = function() { counter.success++ }, success = function() { counter.success++ },
error = function() { counter.error++ }, error = function() { counter.error++ },
complete = function() { counter.complete++ }; complete = function() { counter.complete++ },
send = function() { counter.send++ };
$('#foo').ajaxStart(complete).ajaxStop(complete).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success); $('#foo').ajaxStart(complete).ajaxStop(complete).ajaxSend(send).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success);
// start with successful test // start with successful test
$.ajax({url: "data/name.php", success: success, error: error, complete: function() { $.ajax({url: "data/name.php", beforeSend: send, success: success, error: error, complete: function() {
ok( counter.error == 0, 'Check succesful request' ); ok( counter.error == 0, 'Check succesful request' );
ok( counter.success == 2, 'Check succesful request' ); ok( counter.success == 2, 'Check succesful request' );
ok( counter.complete == 3, 'Check succesful request' ); ok( counter.complete == 3, 'Check succesful request' );
counter.error = counter.success = counter.complete = 0; ok( counter.send == 2, 'Check succesful request' );
counter.error = counter.success = counter.complete = counter.send = 0;
$.ajaxTimeout(500); $.ajaxTimeout(500);
$.ajax({url: "data/name.php?wait=5", success: success, error: error, complete: function() { $.ajax({url: "data/name.php?wait=5", beforeSend: send, success: success, error: error, complete: function() {
ok( counter.error == 2, 'Check failed request' ); ok( counter.error == 2, 'Check failed request' );
ok( counter.success == 0, 'Check failed request' ); ok( counter.success == 0, 'Check failed request' );
ok( counter.complete == 3, 'Check failed request' ); ok( counter.complete == 3, 'Check failed request' );
ok( counter.send == 2, 'Check failed request' );
start(); start();
}}); }});
}}); }});
}); });
test("test global handlers - failure", function() { test("test global handlers - failure", function() {
expect(6); expect(8);
stop(); stop();
var counter = { complete: 0, success: 0, error: 0 }, var counter = { complete: 0, success: 0, error: 0, send: 0 },
success = function() { counter.success++ }, success = function() { counter.success++ },
error = function() { counter.error++ }; error = function() { counter.error++ },
complete = function() { counter.complete++ },
send = function() { counter.send++ };
$.ajaxTimeout(0); $.ajaxTimeout(0);
$.ajax({url: "data/name.php", global: false, success: success, error: error, complete: function() { $('#foo').ajaxStart(complete).ajaxStop(complete).ajaxSend(send).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success);
$.ajax({url: "data/name.php", global: false, beforeSend: send, success: success, error: error, complete: function() {
ok( counter.error == 0, 'Check sucesful request without globals' ); ok( counter.error == 0, 'Check sucesful request without globals' );
ok( counter.success == 1, 'Check sucesful request without globals' ); ok( counter.success == 1, 'Check sucesful request without globals' );
ok( counter.complete == 0, 'Check sucesful request without globals' ); ok( counter.complete == 0, 'Check sucesful request without globals' );
counter.error = counter.success = counter.complete = 0; ok( counter.send == 1, 'Check sucesful request without globals' );
counter.error = counter.success = counter.complete = counter.send = 0;
$.ajaxTimeout(500); $.ajaxTimeout(500);
$.ajax({url: "data/name.php?wait=5", global: false, success: success, error: error, complete: function() { $.ajax({url: "data/name.php?wait=5", global: false, beforeSend: send, success: success, error: error, complete: function() {
ok( counter.error == 1, 'Check failed request without globals' ); ok( counter.error == 1, 'Check failed request without globals' );
ok( counter.success == 0, 'Check failed request without globals' ); ok( counter.success == 0, 'Check failed request without globals' );
ok( counter.complete == 0, 'Check failed request without globals' ); ok( counter.complete == 0, 'Check failed request without globals' );
ok( counter.send == 1, 'Check failed request without globals' );
start(); start();
}}); }});
}}); }});
@ -279,7 +287,7 @@ test("$.ajax - xml: non-namespace elements inside namespaced elements", function
}); });
}); });
test("$.ajax - preprocess", function() { test("$.ajax - beforeSend", function() {
expect(1); expect(1);
stop(); stop();
var customHeader = "value"; var customHeader = "value";