Skip to content
Permalink
Browse files

Moved unload abort code so that the event is only bound if the xhr tr…

…ansport is used. Fixes #5280.
  • Loading branch information...
jaubourg committed Jan 9, 2011
1 parent 8c8bd3b commit 1d1d4fe112c49cbd704d880b27cc646f2bfe1737
Showing with 21 additions and 16 deletions.
  1. +21 −16 src/ajax/xhr.js
@@ -10,7 +10,7 @@ var // Next fake timer id
xhrPool = [],

// #5280: see end of file
xhrUnloadAbortMarker = [];
xhrUnloadAbortMarker;


jQuery.ajax.transport( function( s , determineDataType ) {
@@ -24,6 +24,26 @@ jQuery.ajax.transport( function( s , determineDataType ) {

send: function(headers, complete) {

// #5280: we need to abort on unload or IE will keep connections alive
if ( ! xhrUnloadAbortMarker ) {

xhrUnloadAbortMarker = [];

jQuery(window).bind( "unload" , function() {

// Abort all pending requests
jQuery.each(xhrs, function(_, xhr) {
if ( xhr.onreadystatechange ) {
xhr.onreadystatechange( xhrUnloadAbortMarker );
}
});

// Reset polling structure to be safe
xhrs = {};

});
}

var xhr = xhrPool.pop() || s.xhr(),
handle;

@@ -178,19 +198,4 @@ jQuery.ajax.transport( function( s , determineDataType ) {
}
});

// #5280: we need to abort on unload or IE will keep connections alive
jQuery(window).bind( "unload" , function() {

// Abort all pending requests
jQuery.each(xhrs, function(_, xhr) {
if ( xhr.onreadystatechange ) {
xhr.onreadystatechange( xhrUnloadAbortMarker );
}
});

// Resest polling structure to be safe
xhrs = {};

});

})( jQuery );

0 comments on commit 1d1d4fe

Please sign in to comment.
You can’t perform that action at this time.