Changeset 1684 in ExiteCMS

Timestamp:

08/25/08 17:39:15 (3 years ago)

Author:

hverton

Message:

added error handling code to the ajaxcall function (timeouts, http errors, url errors). Now null will be the return value when an error has occured (to avoid 0 == false issues!)

File:

• trunk/includes/jscripts/core_functions.js (modified) (3 diffs)

trunk/includes/jscripts/core_functions.js

@@ -59 +59 @@
 
 // update the innerHTML of 'id' using an AJAX call
-function clientSideInclude(id, url) {
+function clientSideInclude(id, url, error) {
 
     var element = document.getElementById(id);
@@ -67 +67 @@
     }
     var response = AjaxCall(url);
-    if (response != false) {
+    if (response != null) {
         element.innerHTML = response;
     } else {
-        element.innerHTML = "Sorry, your browser does not support XMLHTTPRequest objects. This page requires Internet Explorer 5 or better for Windows, or Firefox for any system, or Safari. Other compatible browsers may also exist.";
-    }
-}
-
-// simple synchronous AJAX call
+        if (error != null && error) {
+            element.innerHTML = "Sorry, your browser does not support XMLHTTPRequest objects. This page requires Internet Explorer 5 or better for Windows, or Firefox for any system, or Safari. Other compatible browsers may also exist.";
+        }
+    }
+}
+
+// simple synchronous AJAX call, return null when it fails
 function AjaxCall(url) {
 
@@ -98 +100 @@
     }
     if (req) {
-        // Synchronous request, wait till we have it all
-        req.open('GET', url, false);
-        req.send(null);
-        return req.responseText;
-    } else {
-        return false;
+        try {
+            // Synchronous request, wait till we have it all
+            req.open('GET', url, false);
+            req.send(null);
+            if (req.status != 200) {
+                return null;
+            } else {
+                return req.responseText;
+            }
+        } catch (e) {
+            return null;
+        }
+    } else {
+        return null;
     }
 }