deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bug6242' of https://github.com/csnover/jquery into csnover-bug6242

Browse source
This commit is contained in:
John Resig 2010-12-06 17:23:08 -05:00
parent 6c68124928 238ac5a0aa
commit 9759e9f6bb
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/ajax.js
View file

@ -195,6 +195,17 @@ jQuery.extend({
}, },
ajax: function( origSettings ) { ajax: function( origSettings ) {
// IE8 leaks a lot when we've set abort, and IE6-8 a little
// when we have set onreadystatechange. Bug #6242
// XXX IE7 still leaks when abort is called, no matter what
// we do
function cleanup() {
// IE6 will throw an error setting xhr.abort
try {
xhr.abort = xhr.onreadystatechange = jQuery.noop;
} catch(e) {}
}
var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings), var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type); jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type);
@ -406,13 +417,12 @@ jQuery.extend({
requestDone = true; requestDone = true;
if ( xhr ) { if ( xhr ) {
xhr.onreadystatechange = jQuery.noop; cleanup();
} }
// The transfer is complete and the data is available, or the request timed out // The transfer is complete and the data is available, or the request timed out
} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) { } else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
requestDone = true; requestDone = true;
xhr.onreadystatechange = jQuery.noop;
status = isTimeout === "timeout" ? status = isTimeout === "timeout" ?
"timeout" : "timeout" :
@ -454,10 +464,7 @@ jQuery.extend({
xhr.abort(); xhr.abort();
} }
// Stop memory leaks cleanup();
if ( s.async ) {
xhr = null;
}
} }
}; };