flush wrapped to be able to do flush and ob_flush

[brisk.git] / web / xhr.js

diff --git a/web/xhr.js b/web/xhr.js
index 196ad1d..d023eb3 100644 (file)
--- a/web/xhr.js
+++ b/web/xhr.js
@@ -1,7 +1,7 @@
 /*
  *  brisk - xhr.js
  *
- *  Copyright (C) 2006-2008 Matteo Nastasi
+ *  Copyright (C) 2006-2011 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -19,8 +19,6 @@
  * not, write to the Free Software Foundation, Inc, 59 Temple Place -
  * Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id$
- *
  */
 
 var xhr_rd_cookiepath = "/brisk/";
@@ -58,7 +56,7 @@ function xhr_rd_cb(xhr_rd)
     // console.log(xhr_rd.readyState);
 
     if (xhr_rd.readyState == 4) {
-        if (xhr_rd_watchdog != null) {
+        if (typeof xhr_rd_watchdog != 'undefined' && xhr_rd_watchdog != null) {
             hbit('C');
             clearTimeout(xhr_rd_watchdog);
             xhr_rd_watchdog = null;
@@ -93,7 +91,8 @@ function xhr_rd_abort(xhr)
 function xhr_rd_start(sess,stat,subst,step) 
 {
     if (the_end) {
-        if (xhr_rd_watchdog != null) {
+        //x alert("the_end1");
+        if (typeof xhr_rd_watchdog != 'undefined' && xhr_rd_watchdog != null) {
             hbit('C');
             clearTimeout(xhr_rd_watchdog);
             xhr_rd_watchdog = null;
@@ -198,7 +197,8 @@ function xhr_rd_poll(sess)
                    
                }
                 else {
-                    if (xhr_rd_watchdog != null) {
+                    //x alert("the_end2");
+                    if (typeof xhr_rd_watchdog != 'undefined' && xhr_rd_watchdog != null) {
                         clearTimeout(xhr_rd_watchdog);
                         xhr_rd_watchdog = null;
                     }
@@ -302,9 +302,12 @@ function xhr_rd_poll(sess)
        setTimeout(xhr_rd_poll, tout, sess);
     }
     else {
-        if (xhr_rd_watchdog != null) {
-            clearTimeout(xhr_rd_watchdog);
-            xhr_rd_watchdog = null;
+        //x alert("the_end3");
+        if (typeof(xhr_rd_watchdog) != 'undefined') {
+            if (xhr_rd_watchdog != null) {
+                clearTimeout(xhr_rd_watchdog);
+                xhr_rd_watchdog = null;
+            }
         }
     }
     return;