X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=e17dfa89a6f1a90a9e70c75ce35132e34f97a298;hb=a18f682012ae8e63f3b43b39375b3c5ce0a561e3;hp=08fa08b31e55225227e69e00f88f801415f46bfb;hpb=5353c6bcc352c4d900cc76af110e56ee1e70ae0f;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 08fa08b..e17dfa8 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -278,8 +278,10 @@ jQuery.extend({
 			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
 		}
 
+		jQuery.active++;
+
 		// Watch for a new set of requests
-		if ( s.global && ! jQuery.active++ ) {
+		if ( s.global && jQuery.active === 1 ) {
 			jQuery.event.trigger( "ajaxStart" );
 		}
 
@@ -386,7 +388,7 @@ jQuery.extend({
 		}
 
 		if ( s.global ) {
-			trigger("ajaxSend", [xhr, s]);
+			contextTrigger("ajaxSend", [xhr, s]);
 		}
 
 		// Wait for a response to come back
@@ -499,7 +501,7 @@ jQuery.extend({
 
 			// Fire the global callback
 			if ( s.global ) {
-				trigger( "ajaxSuccess", [xhr, s] );
+				contextTrigger( "ajaxSuccess", [xhr, s] );
 			}
 		}
 
@@ -511,7 +513,7 @@ jQuery.extend({
 
 			// The request was completed
 			if ( s.global ) {
-				trigger( "ajaxComplete", [xhr, s] );
+				contextTrigger( "ajaxComplete", [xhr, s] );
 			}
 
 			// Handle the global AJAX counter
@@ -520,7 +522,7 @@ jQuery.extend({
 			}
 		}
 		
-		function trigger(type, args) {
+		function contextTrigger(type, args) {
 			(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
 		}