Oops, order of operations.

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 6c8a22e..9e30eef 100644 (file)
--- 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;