Skip to content
Permalink
Browse files

Merge branch 'bug-5735'

  • Loading branch information
jeresig committed Dec 31, 2009
2 parents 6cf981e + 6cb2945 commit 40ce7f98301e4ff0d912f91025af0fd7b82107bd
Showing with 20 additions and 31 deletions.
  1. +16 −29 src/ajax.js
  2. +2 −0 src/core.js
  3. +1 −1 src/event.js
  4. +1 −1 src/offset.js
@@ -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;

// Handle the global AJAX counter
if ( s.global && ! --jQuery.active ) {
jQuery.event.trigger( "ajaxStop" );
}
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,19 +438,14 @@ 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 ) {
setTimeout(function() {
// Check to see if the request is still happening
if ( xhr && !requestDone ) {
onreadystatechange( "timeout" );
}
}, s.timeout);
}
// Timeout checker
if ( s.async && s.timeout > 0 ) {
setTimeout(function() {
// Check to see if the request is still happening
if ( xhr && !requestDone ) {
onreadystatechange( "timeout" );
}
}, s.timeout);
}

// Send the data
@@ -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) ) {
@@ -427,7 +427,7 @@ jQuery.event = {
ready: {
// Make sure the ready event is setup
setup: jQuery.bindReady,
teardown: function() {}
teardown: jQuery.noop
},

live: {
@@ -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 ) {

0 comments on commit 40ce7f9

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