Changeset 1100

Timestamp:

10/28/08 15:00:35 (5 years ago)

Author:

douglas

Message:

FIXED Ticket #1317 Add failure handlers to getback and postback functions
CHANGED Relaxed Success handling to support all HTTP success codes.

Files:

• trunk/XinhaCore.js (modified) (8 diffs)

trunk/XinhaCore.js

@@ -6188 +6188 @@
 };
 
-/** Use XMLHTTPRequest to post some data back to the server and do something
- *  with the response (asyncronously!), this is used by such things as the tidy functions
- *  @param {String} url The address for the HTTPRequest
- *  @param {Object} data The data to be passed to the server like {name:"value"}
- *  @param {Function} handler A function that is called when an answer is received from the server with the responseText 
- *                             as argument                             
+/**
+ * Use XMLHTTPRequest to post some data back to the server and do something
+ * with the response (asyncronously!), this is used by such things as the tidy
+ * functions
+ * @param {String} url The address for the HTTPRequest
+ * @param {Object} data The data to be passed to the server like {name:"value"}
+ * @param {Function} success A function that is called when an answer is
+ *                           received from the server with the responseText as argument.
+ * @param {Function} failure A function that is called when we fail to receive
+ *                           an answer from the server. We pass it the request object.
  */
  
@@ -6201 +6205 @@
 // then Xinha._postback_send_charset will be set to false and the request tried again (once)
 Xinha._postback_send_charset = true;
-Xinha._postback = function(url, data, handler)
+Xinha._postback = function(url, data, success, failure)
 {
   var req = null;
@@ -6223 +6227 @@
     if ( req.readyState == 4 )
     {
-      if ( req.status == 200 || Xinha.isRunLocally && req.status == 0 )
-      {
-        if ( typeof handler == 'function' )
+      if ( ((req.status / 100) == 2) || Xinha.isRunLocally && req.status == 0 )
+      {
+        if ( typeof success == 'function' )
         {
-          handler(req.responseText, req);
+          success(req.responseText, req);
         }
       }
@@ -6233 +6237 @@
       {        
         Xinha._postback_send_charset = false;
-        Xinha._postback(url,data,handler);
+        Xinha._postback(url,data,success, failure);
+      }
+      else if (typeof failure == 'function')
+      {
+        failure(req);
       }
       else
@@ -6247 +6255 @@
   req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'+(Xinha._postback_send_charset ? '; charset=UTF-8' : ''));
 
-  //alert(content);
   req.send(content);
 };
 
-/** Use XMLHTTPRequest to receive some data from the server and do something
- *  with the it (asyncronously!)
- *  @param {String} url The address for the HTTPRequest
- *  @param {Function} handler A function that is called when an answer is received from the server with the responseText 
- *                             as argument                             
- */
-Xinha._getback = function(url, handler)
+/** 
+ * Use XMLHTTPRequest to receive some data from the server and do something
+ * with the it (asyncronously!)
+ * @param {String} url The address for the HTTPRequest
+ * @param {Function} success A function that is called when an answer is
+ *                           received from the server with the responseText as argument.
+ * @param {Function} failure A function that is called when we fail to receive
+ *                           an answer from the server. We pass it the request object.
+ */
+Xinha._getback = function(url, success, failure)
 {
   var req = null;
@@ -6266 +6276 @@
     if ( req.readyState == 4 )
     {
-      if ( req.status == 200 || Xinha.isRunLocally && req.status == 0 )
-      {
-        handler(req.responseText, req);
+      if ( ((req.status / 100) == 2) || Xinha.isRunLocally && req.status == 0 )
+      {
+        success(req.responseText, req);
+      }
+      else if (typeof failure == 'function')
+      {
+        failure(req);
       }
       else
@@ -6291 +6305 @@
     if ( req.readyState == 4 )
     {
-      if ( req.status == 200 || Xinha.isRunLocally && req.status == 0 )
+      if ( ((req.status / 100) == 2) || Xinha.isRunLocally && req.status == 0 )
       {
         if (successHandler) successHandler(req);
@@ -6322 +6336 @@
   req.open('GET', url, false);
   req.send(null);
-  if ( req.status == 200 || Xinha.isRunLocally && req.status == 0 )
+  if ( ((req.status / 100) == 2) || Xinha.isRunLocally && req.status == 0 )
   {
     return req.responseText;