git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0fd3648
)
Made some tweaks to the different AJAX callbacks.
author
John Resig
<jeresig@gmail.com>
Thu, 22 Jun 2006 22:25:03 +0000
(22:25 +0000)
committer
John Resig
<jeresig@gmail.com>
Thu, 22 Jun 2006 22:25:03 +0000
(22:25 +0000)
ajax/ajax.js
patch
|
blob
|
history
diff --git
a/ajax/ajax.js
b/ajax/ajax.js
index
2586f3f
..
5d6126a
100644
(file)
--- a/
ajax/ajax.js
+++ b/
ajax/ajax.js
@@
-83,7
+83,7
@@
if ( jQuery.browser == "msie" )
// Attach a bunch of functions for handling common AJAX events
(function(){
// Attach a bunch of functions for handling common AJAX events
(function(){
- var e = "ajaxStart.ajaxComplete.ajaxError.ajaxSuccess".split(',');
+ var e = "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess".split(',');
for ( var i = 0; i < e.length; i++ ){ (function(){
var o = e[i];
for ( var i = 0; i < e.length; i++ ){ (function(){
var o = e[i];
@@
-105,6
+105,10
@@
jQuery.ajax = function( type, url, data, ret ) {
url = type.url;
type = type.type;
}
url = type.url;
type = type.type;
}
+
+ // Watch for a new set of requests
+ if ( ! jQuery.ajax.active++ )
+ jQuery.event.trigger( "ajaxStart" );
// Create the request object
var xml = new XMLHttpRequest();
// Create the request object
var xml = new XMLHttpRequest();
@@
-125,23
+129,8
@@
jQuery.ajax = function( type, url, data, ret ) {
// Wait for a response to come back
xml.onreadystatechange = function(){
// Wait for a response to come back
xml.onreadystatechange = function(){
- // Socket is openend
- if ( xml.readyState == 1 ) {
- // Increase counter
- jQuery.ajax.active++;
-
- // Show 'loader'
- jQuery.event.trigger( "ajaxStart" );
- }
-
- // Socket is closed and data is available
+ // The transfer is complete and the data is available
if ( xml.readyState == 4 ) {
if ( xml.readyState == 4 ) {
- // Hide loader if needed
- if ( ! --jQuery.ajax.active ) {
- jQuery.event.trigger( "ajaxComplete" );
- jQuery.ajax.active = 0
- }
-
// Make sure that the request was successful
if ( jQuery.httpSuccess( xml ) ) {
// Make sure that the request was successful
if ( jQuery.httpSuccess( xml ) ) {
@@
-159,6
+148,13
@@
jQuery.ajax = function( type, url, data, ret ) {
// Fire the global callback
jQuery.event.trigger( "ajaxError" );
}
// Fire the global callback
jQuery.event.trigger( "ajaxError" );
}
+
+ // The request was completed
+ jQuery.event.trigger( "ajaxComplete" );
+
+ // Handle the global AJAX counter
+ if ( ! --jQuery.ajax.active )
+ jQuery.event.trigger( "ajaxStop" );
// Process result
if ( ret ) ret(xml);
// Process result
if ( ret ) ret(xml);