git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8013p' of https://github.com/rwldrn/jquery into rwldrn-8013p
[jquery.git]
/
src
/
ajax
/
xhr.js
diff --git
a/src/ajax/xhr.js
b/src/ajax/xhr.js
index
cd9838c
..
7a4da2d
100644
(file)
--- a/
src/ajax/xhr.js
+++ b/
src/ajax/xhr.js
@@
-128,7
+128,6
@@
if ( jQuery.support.ajax ) {
callback = 0;
// Do not keep as active anymore
callback = 0;
// Do not keep as active anymore
- // and store back into pool
if (handle) {
xhr.onreadystatechange = jQuery.noop;
delete xhrs[ handle ];
if (handle) {
xhr.onreadystatechange = jQuery.noop;
delete xhrs[ handle ];
@@
-150,6
+149,12
@@
if ( jQuery.support.ajax ) {
responses = {},
xml = xhr.responseXML;
responses = {},
xml = xhr.responseXML;
+ // Construct response list
+ if ( xml && xml.documentElement /* #4958 */ ) {
+ responses.xml = xml;
+ }
+ responses.text = xhr.responseText;
+
try { // Firefox throws an exception when accessing statusText for faulty cross-domain requests
statusText = xhr.statusText;
try { // Firefox throws an exception when accessing statusText for faulty cross-domain requests
statusText = xhr.statusText;
@@
-185,15
+190,8
@@
if ( jQuery.support.ajax ) {
status
);
status
);
- // Construct response list
- if ( xml && xml.documentElement /* #4958 */ ) {
- responses.xml = xml;
- }
- responses.text = xhr.responseText;
-
// Call complete
// Call complete
- complete(status,statusText,s.determineResponse( responses,
- xhr.getResponseHeader( "content-type" ) ),responseHeaders);
+ complete(status,statusText,responses,responseHeaders);
}
}
};
}
}
};