X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=9e30eef1e582d5564c3527a3449b18f4f8fab0bb;hb=4503457616372973054a85c1628031792a4882f3;hp=6c8a22e8a841339f83a012e808a4f46236fbe83f;hpb=b850ab2b8e65eadd25093c81bbc67a881daa0488;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 6c8a22e..9e30eef 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -143,13 +143,15 @@ jQuery.extend({
 		url: location.href,
 		global: true,
 		type: "GET",
-		timeout: 0,
 		contentType: "application/x-www-form-urlencoded",
 		processData: true,
 		async: true,
+		/*
+		timeout: 0,
 		data: null,
 		username: null,
 		password: null,
+		*/
 		// Create the request object; Microsoft failed to properly
 		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
 		// This function can be overriden by calling jQuery.ajaxSetup
@@ -497,7 +499,7 @@ jQuery.extend({
 
 			// Get the JavaScript object, if JSON is used.
 			if ( type == "json" )
-				data = eval("(" + data + ")");
+				data = window["eval"]("(" + data + ")");
 		}
 		
 		return data;