For fix #1999 changed the RegExp to be non-greedy. Thanks emartin24.

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index f401c85..1049614 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -52,10 +52,7 @@ jQuery.fn.extend({
                                                // If not, just inject the full result
                                                res.responseText );
 
-                               // Add delay to account for Safari's delay in globalEval
-                               setTimeout(function(){
-                                       self.each( callback, [res.responseText, status, res] );
-                               }, 13);
+                               self.each( callback, [res.responseText, status, res] );
                        }
                });
                return this;
@@ -179,7 +176,7 @@ jQuery.extend({
 
                        // Replace the =? sequence both in the query string and the data
                        if ( s.data )
-                               s.data = s.data.replace(jsre, "=" + jsonp);
+                               s.data = (s.data + "").replace(jsre, "=" + jsonp);
                        s.url = s.url.replace(jsre, "=" + jsonp);
 
                        // We need to make sure
@@ -200,8 +197,13 @@ jQuery.extend({
                if ( s.dataType == "script" && s.cache == null )
                        s.cache = false;
 
-               if ( s.cache === false && s.type.toLowerCase() == "get" )
-                       s.url += (s.url.match(/\?/) ? "&" : "?") + "_=" + (new Date()).getTime();
+               if ( s.cache === false && s.type.toLowerCase() == "get" ) {
+                       var ts = (new Date()).getTime();
+                       // try replacing _= if it is there
+                       var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
+                       // if nothing was replaced, add timestamp to the end
+                       s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
+               }
 
                // If data is available, append data to url for get requests
                if ( s.data && s.type.toLowerCase() == "get" ) {
@@ -217,13 +219,13 @@ jQuery.extend({
 
                // If we're requesting a remote document
                // and trying to load JSON or Script
-               if ( !s.url.indexOf("http") && s.dataType == "script" ) {
+               if ( !s.url.indexOf("http") && ( s.dataType == "script" || s.dataType =="json" ) ) {
                        var head = document.getElementsByTagName("head")[0];
                        var script = document.createElement("script");
                        script.src = s.url;
 
                        // Handle Script loading
-                       if ( !jsonp && (s.success || s.complete) ) {
+                       if ( !jsonp ) {
                                var done = false;
 
                                // Attach handlers for all browsers
@@ -270,7 +272,7 @@ jQuery.extend({
                        s.beforeSend(xml);
                        
                if ( s.global )
-                   jQuery.event.trigger("ajaxSend", [xml, s]);
+                       jQuery.event.trigger("ajaxSend", [xml, s]);
 
                // Wait for a response to come back
                var onreadystatechange = function(isTimeout){
@@ -397,8 +399,9 @@ jQuery.extend({
        // Determines if an XMLHttpRequest was successful or not
        httpSuccess: function( r ) {
                try {
+                       // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
                        return !r.status && location.protocol == "file:" ||
-                               ( r.status >= 200 && r.status < 300 ) || r.status == 304 ||
+                               ( r.status >= 200 && r.status < 300 ) || r.status == 304 || r.status == 1223 ||
                                jQuery.browser.safari && r.status == undefined;
                } catch(e){}
                return false;