Merge branch 'bug-5735'

This commit is contained in:
jeresig 2009-12-31 14:49:01 -05:00
commit 40ce7f9830
4 changed files with 19 additions and 30 deletions

View file

@ -380,29 +380,21 @@ jQuery.extend({
}
// Wait for a response to come back
var onreadystatechange = function( isTimeout ) {
var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
// The request was aborted, clear the interval and decrement jQuery.active
if ( !xhr || xhr.readyState === 0 ) {
if ( ival ) {
// clear poll interval
clearInterval( ival );
ival = null;
requestDone = true;
xhr.onreadystatechange = jQuery.noop;
// Handle the global AJAX counter
if ( s.global && ! --jQuery.active ) {
jQuery.event.trigger( "ajaxStop" );
}
}
// The transfer is complete and the data is available, or the request timed out
} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
requestDone = true;
// clear poll interval
if (ival) {
clearInterval(ival);
ival = null;
}
xhr.onreadystatechange = jQuery.noop;
status = isTimeout === "timeout" ?
"timeout" :
@ -446,12 +438,8 @@ jQuery.extend({
}
};
if ( s.async ) {
// don't attach the handler to the request, just poll it instead
var ival = setInterval(onreadystatechange, 13);
// Timeout checker
if ( s.timeout > 0 ) {
if ( s.async && s.timeout > 0 ) {
setTimeout(function() {
// Check to see if the request is still happening
if ( xhr && !requestDone ) {
@ -459,7 +447,6 @@ jQuery.extend({
}
}, s.timeout);
}
}
// Send the data
try {

View file

@ -464,6 +464,8 @@ jQuery.extend({
return true;
},
noop: function() {},
// Evalulates a script in a global context
globalEval: function( data ) {
if ( data && rnotwhite.test(data) ) {

View file

@ -427,7 +427,7 @@ jQuery.event = {
ready: {
// Make sure the ready event is setup
setup: jQuery.bindReady,
teardown: function() {}
teardown: jQuery.noop
},
live: {

View file

@ -121,7 +121,7 @@ jQuery.offset = {
body.removeChild( container );
body = container = innerDiv = checkDiv = table = td = null;
jQuery.offset.initialize = function() {};
jQuery.offset.initialize = jQuery.noop;
},
bodyOffset: function( body ) {