Renamed preprocess to before, for consistency with form plugin

[jquery.git] / src / ajax / ajax.js

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index e5a3854..cf6298d 100644 (file)
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -122,9 +122,10 @@ jQuery.fn.extend({
                return this.find('script').each(function(){
                        if ( this.src )
                                // for some weird reason, it doesn't work if the callback is ommited
-                               jQuery.getScript( this.src, function() {} );
-                       else
-                               eval.call( window, this.text || this.textContent || this.innerHTML || "" );
+                               jQuery.getScript( this.src );
+                       else {
+                               jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
+                       }
                }).end();
        }
 
@@ -133,10 +134,7 @@ jQuery.fn.extend({
 // If IE is used, create a wrapper for the XMLHttpRequest object
 if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
        XMLHttpRequest = function(){
-               return new ActiveXObject(
-                       navigator.userAgent.indexOf("MSIE 5") >= 0 ?
-                       "Microsoft.XMLHTTP" : "Msxml2.XMLHTTP"
-               );
+               return new ActiveXObject("Microsoft.XMLHTTP");
        };
 
 // Attach a bunch of functions for handling common AJAX events
@@ -303,6 +301,10 @@ jQuery.extend({
         * Loads, and executes, a remote JavaScript file using an HTTP GET request.
         * All of the arguments to the method (except URL) are optional.
         *
+        * Warning: Safari <= 2.0.x is unable to evalulate scripts in a global
+        * context sychronously. If you load functions via getScript, make sure
+        * to call them after a delay.
+        *
         * @example $.getScript("test.js")
         *
         * @example $.getScript("test.js", function(){
@@ -467,7 +469,7 @@ jQuery.extend({
         * function gets passed two arguments: The XMLHttpRequest object and a
         * string describing the type the success of the request.
         *
-        * (String) data - Data to be sent to the server. Converted to a query
+        * (Object|String) data - Data to be sent to the server. Converted to a query
         * string, if not already a string. Is appended to the url for GET-requests.
         * Override processData option to prevent processing.
         *
@@ -482,6 +484,9 @@ jQuery.extend({
         * (Boolean) async - By default, all requests are send asynchronous (set to true).
         * If you need synchronous requests, set this option to false.
         *
+        * (Function) before - A pre-callback to set custom headers etc., the
+        * XMLHttpRequest is passed as the only argument.
+        *
         * @example $.ajax({
         *   type: "GET",
         *   url: "test.js",
@@ -519,7 +524,8 @@ jQuery.extend({
                        data: null,
                        contentType: "application/x-www-form-urlencoded",
                        processData: true,
-                       async: true
+                       async: true,
+                       before: null
                }, s);
 
                // if data available
@@ -560,6 +566,10 @@ jQuery.extend({
                // Make sure the browser sends the right content length
                if ( xml.overrideMimeType )
                        xml.setRequestHeader("Connection", "close");
+                       
+               // Allow custom headers/mimetypes
+               if( s.before )
+                       s.before(xml);
 
                // Wait for a response to come back
                var onreadystatechange = function(isTimeout){
@@ -581,9 +591,12 @@ jQuery.extend({
                                        if ( s.ifModified && modRes )
                                                jQuery.lastModified[s.url] = modRes;
 
-                                       // If a local callback was specified, fire it
+                                       // process the data (runs the xml through httpData regardless of callback)
+                                       var data = jQuery.httpData( xml, s.dataType );
+
+                                       // If a local callback was specified, fire it and pass it the data
                                        if ( s.success )
-                                               s.success( jQuery.httpData( xml, s.dataType ), status );
+                                               s.success( data, status );
 
                                        // Fire the global callback
                                        if( s.global )
@@ -678,8 +691,10 @@ jQuery.extend({
                var data = !type && ct && ct.indexOf("xml") >= 0;
                data = type == "xml" || data ? r.responseXML : r.responseText;
 
-               // If the type is "script", eval it
-               if ( type == "script" ) eval.call( window, data );
+               // If the type is "script", eval it in global context
+               if ( type == "script" ) {
+                       jQuery.globalEval( data );
+               }
 
                // Get the JavaScript object, if JSON is used.
                if ( type == "json" ) eval( "data = " + data );
@@ -706,10 +721,10 @@ jQuery.extend({
                } else {
                        // Serialize the key/values
                        for ( var j in a ) {
-                               //if one value is array then treat each array value in part
-                               if (typeof a[j] == 'object') {
+                               // If the value is an array then the key names need to be repeated
+                               if( a[j].constructor == Array ) {
                                        for (var k = 0; k < a[j].length; k++) {
-                                               s.push( j + "[]=" + encodeURIComponent( a[j][k] ) );
+                                               s.push( j + "=" + encodeURIComponent( a[j][k] ) );
                                        }
                                } else {
                                        s.push( j + "=" + encodeURIComponent( a[j] ) );
@@ -719,6 +734,18 @@ jQuery.extend({
 
                // Return the resulting serialization
                return s.join("&");
+       },
+       
+       // evalulates a script in global context
+       // not reliable for safari
+       globalEval: function(data) {
+               if (window.execScript)
+                       window.execScript( data );
+               else if(jQuery.browser.safari)
+                       // safari doesn't provide a synchronous global eval
+                       window.setTimeout( data, 0 );
+               else
+                       eval.call( window, data );
        }
 
 });