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 (from parent 1:
d7d6471
)
Passes jXHR object as third argument of prefilters and transport factories.
author
jaubourg
<j@ubourg.net>
Wed, 26 Jan 2011 16:37:08 +0000
(17:37 +0100)
committer
jaubourg
<j@ubourg.net>
Wed, 26 Jan 2011 16:37:08 +0000
(17:37 +0100)
src/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax.js
b/src/ajax.js
index
caacb60
..
592f297
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-73,7
+73,7
@@
function addToPrefiltersOrTransports( structure ) {
}
//Base inspection function for prefilters and transports
}
//Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions,
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jXHR,
dataType /* internal */, inspected /* internal */ ) {
dataType = dataType || options.dataTypes[ 0 ];
dataType /* internal */, inspected /* internal */ ) {
dataType = dataType || options.dataTypes[ 0 ];
@@
-97,7
+97,7
@@
function inspectPrefiltersOrTransports( structure, options, originalOptions,
} else {
options.dataTypes.unshift( selection );
selection = inspectPrefiltersOrTransports(
} else {
options.dataTypes.unshift( selection );
selection = inspectPrefiltersOrTransports(
- structure, options, originalOptions, selection, inspected );
+ structure, options, originalOptions, jXHR, selection, inspected );
}
}
}
}
}
}
@@
-105,7
+105,7
@@
function inspectPrefiltersOrTransports( structure, options, originalOptions,
// we try the catchall dataType if not done already
if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
selection = inspectPrefiltersOrTransports(
// we try the catchall dataType if not done already
if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
selection = inspectPrefiltersOrTransports(
- structure, options, originalOptions, "*", inspected );
+ structure, options, originalOptions, jXHR, "*", inspected );
}
// unnecessary when only executing (prefilters)
// but it'll be ignored by the caller in that case
}
// unnecessary when only executing (prefilters)
// but it'll be ignored by the caller in that case
@@
-565,7
+565,7
@@
jQuery.extend({
}
// Apply prefilters
}
// Apply prefilters
- inspectPrefiltersOrTransports( prefilters, s, options );
+ inspectPrefiltersOrTransports( prefilters, s, options, jXHR );
// Uppercase the type
s.type = s.type.toUpperCase();
// Uppercase the type
s.type = s.type.toUpperCase();
@@
-638,7
+638,7
@@
jQuery.extend({
}
// Get transport
}
// Get transport
- transport = inspectPrefiltersOrTransports( transports, s, options );
+ transport = inspectPrefiltersOrTransports( transports, s, options, jXHR );
// If no transport, we auto-abort
if ( !transport ) {
// If no transport, we auto-abort
if ( !transport ) {