Merge branch 'bug-5735'

diff --git a/src/ajax.js b/src/ajax.js
index 098a561..37fb75b 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.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

diff --git a/src/core.js b/src/core.js
index 944e8a9..93f04ec 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -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) ) {

diff --git a/src/event.js b/src/event.js
index 0bf7d90..64b202d 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -427,7 +427,7 @@ jQuery.event = {
                ready: {
                        // Make sure the ready event is setup
                        setup: jQuery.bindReady,
-                       teardown: function() {}
+                       teardown: jQuery.noop
                },
 
                live: {

diff --git a/src/offset.js b/src/offset.js
index 7ae9cb9..d12921d 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -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 ) {