X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=c255dfebaaeafb6247a13e29eb2d1d4453b57722;hb=434b87b8a233eb24ec773de801f3adb460fbd0f4;hp=d02d33135a4e38804bb6284308e5ff858373fdc5;hpb=d81dfbcccf07aa63c6bf5beb10a2d37207d9e340;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index d02d331..c255dfe 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -459,8 +459,7 @@ jQuery.extend({ try { // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450 return !xhr.status && location.protocol == "file:" || - ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223 || - jQuery.browser.safari && xhr.status === undefined; + ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223; } catch(e){} return false; }, @@ -471,8 +470,7 @@ jQuery.extend({ var xhrRes = xhr.getResponseHeader("Last-Modified"); // Firefox always returns 200. check Last-Modified date - return xhr.status == 304 || xhrRes == jQuery.lastModified[url] || - jQuery.browser.safari && xhr.status === undefined; + return xhr.status == 304 || xhrRes == jQuery.lastModified[url]; } catch(e){} return false; }, @@ -499,7 +497,7 @@ jQuery.extend({ // Get the JavaScript object, if JSON is used. if ( type == "json" ) - data = eval("(" + data + ")"); + data = window["eval"]("(" + data + ")"); } return data;