aboutsummaryrefslogtreecommitdiffstats
path: root/src/ajax.js
diff options
context:
space:
mode:
authorjeresig <jeresig@gmail.com>2010-03-01 12:44:56 -0500
committerjeresig <jeresig@gmail.com>2010-03-01 12:44:56 -0500
commita18f682012ae8e63f3b43b39375b3c5ce0a561e3 (patch)
treee897c8e14067e1fd3ef7bd658f0ef91afdcf7d0a /src/ajax.js
parent5353c6bcc352c4d900cc76af110e56ee1e70ae0f (diff)
downloadjquery-a18f682012ae8e63f3b43b39375b3c5ce0a561e3.tar.gz
jquery-a18f682012ae8e63f3b43b39375b3c5ce0a561e3.zip
Made some code tweaks related to running jQuery through JSLint (thanks to Lorin Larson for the JSLint run).
Diffstat (limited to 'src/ajax.js')
-rw-r--r--src/ajax.js12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ajax.js b/src/ajax.js
index 08fa08b31..e17dfa89a 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);
}