Added onSuccess and onError callbacks for the $.xml() function.

[jquery.git] / ajax / ajax.js

diff --git a/ajax/ajax.js b/ajax/ajax.js
index 98569e1..8e0f81f 100644 (file)
--- a/ajax/ajax.js
+++ b/ajax/ajax.js
@@ -13,6 +13,15 @@ if ( typeof XMLHttpRequest == 'undefined' && typeof window.ActiveXObject == 'fun
 $.xmlActive=0;
 
 $.xml = function( type, url, data, ret ) {
+       if ( !url ) {
+               ret = type.onComplete;
+               var onSuccess = type.onSuccess;
+               var onError = type.onError;
+               data = type.data;
+               url = type.url;
+               type = type.type;
+       }
+
        var xml = new XMLHttpRequest();
 
        if ( xml ) {
@@ -24,7 +33,8 @@ $.xml = function( type, url, data, ret ) {
                // Set header so calling script knows that it's an XMLHttpRequest
                xml.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 
-               /* Force "Connection: close" for Mozilla browsers to work around
+               /* Borrowed from Prototype:
+                * Force "Connection: close" for Mozilla browsers to work around
                 * a bug where XMLHttpReqeuest sends an incorrect Content-length
                 * header. See Mozilla Bugzilla #246651.
                 */
@@ -53,6 +63,13 @@ $.xml = function( type, url, data, ret ) {
                                        $.xmlActive = 0
                                }
 
+                               if ( xml.status && xml.status >= 200 && xml.status < 300 ) {
+                                       if ( onSuccess )
+                                               onSuccess( xml );
+                               } else if ( onError ) {
+                                       onError( xml );
+                               }
+
                                // Process result
                                if ( ret )
                                        ret(xml);
@@ -120,18 +137,15 @@ $.fn.load = function(a,o,f) {
                t = "POST";
        }
        var self = this;
-       $.xml(t,a,o,function(h){
-               // Get HTTP data
-               h = $.httpData(h);
-
+       $.xml(t,a,o,function(res){
                // Assign it and execute all scripts
-               self.html(h).find("script").each(function(){
-                       try { $.execute( this.text || this.textContent || this.innerHTML || ""); } catch(e){}
+               self.html(res.responseText).find("script").each(function(){
+                       try { eval( this.text || this.textContent || this.innerHTML || ""); } catch(e){}
                });
 
                // Callback function
                if (f && f.constructor == Function)
-                       f(h);
+                       f(res.responseText);
        });
        return this;
 };
@@ -319,22 +333,8 @@ $.fn.putForm = function(target, pre_cb, post_cb, url, mth) {
                $(target).load(url, this.vars, post_cb);
        } else {
                this.vars.push({name: 'evaljs', value: 1});
-               $.xml(mth, url, $.param(this.vars), function(r) { $.execute(r.responseText); });
+               $.xml(mth, url, $.param(this.vars), function(r) { eval(r.responseText); });
        }
 
        return this;
 }
-
-// ------------------------------------------------------
-
-$.fn.changer = function(form, target, pre_cb, post_cb) {
-       $(form).submit(function(e) {
-               e.preventDefault();
-               return false;
-       });
-       this.change(function(e) {
-               e.preventDefault();
-               $(form).getForm().putForm(target, pre_cb, post_cb);
-               return this;
-       });
-}
\ No newline at end of file