git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made some code tweaks related to running jQuery through JSLint (thanks to Lorin Larso...
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
08fa08b
..
e17dfa8
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-278,8
+278,10
@@
jQuery.extend({
s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
}
s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
}
+ jQuery.active++;
+
// Watch for a new set of requests
// Watch for a new set of requests
- if ( s.global && ! jQuery.active++ ) {
+ if ( s.global && jQuery.active === 1 ) {
jQuery.event.trigger( "ajaxStart" );
}
jQuery.event.trigger( "ajaxStart" );
}
@@
-386,7
+388,7
@@
jQuery.extend({
}
if ( s.global ) {
}
if ( s.global ) {
- trigger("ajaxSend", [xhr, s]);
+ contextTrigger("ajaxSend", [xhr, s]);
}
// Wait for a response to come back
}
// Wait for a response to come back
@@
-499,7
+501,7
@@
jQuery.extend({
// Fire the global callback
if ( s.global ) {
// 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 ) {
// The request was completed
if ( s.global ) {
- trigger( "ajaxComplete", [xhr, s] );
+ contextTrigger( "ajaxComplete", [xhr, s] );
}
// Handle the global AJAX counter
}
// 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);
}
(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
}