Changeset 543

Timestamp:

09/10/08 00:39:45 (4 months ago)

Author:

heyadayo

Message:

fix navigate/close errors with firefox xhrstream due to heartbeats

Files:

• branches/0.7/daemon/orbited/static/Orbited.js (modified) (5 diffs)

branches/0.7/daemon/orbited/static/Orbited.js

@@ +1 @@
+
 // NOTE: to log/debug with Orbited, there are two methods:
 //          Use firebug 
@@ -592 +593 @@
 ;;;     self.logger.debug('transportOnClose');
         if (self.readyState < self.READY_STATE_CLOSED) {
-            doClose(Orbited.Statuses.ServerClosedConnection)
+            try {
+                doClose(Orbited.Statuses.ServerClosedConnection)
+            }
+            catch(e) {
+//              Fix for navigation-close
+                return
+            }
         }
     }        
@@ -1162 +1169 @@
                         // If we got a 200, then we're in business
                         if (status == 200) {
-                            heartbeatTimer = window.setTimeout(heartbeatTimeout, Orbited.settings.HEARTBEAT_TIMEOUT);
+                            try {
+                                heartbeatTimer = window.setTimeout(heartbeatTimeout, Orbited.settings.HEARTBEAT_TIMEOUT);
+                            }
+                            catch(e) {
+//                               Happens after navigation
+                                 self.close()
+                                 return
+                            }
                             var testtimer = heartbeatTimer;
                         }
@@ -1244 +1258 @@
 //            self.logger.debug('do abort..')
             xhr.abort();
-            window.clearTimeout(heartbeatTimer);            
+            window.clearTimeout(heartbeatTimer);
         }
         else {
@@ -1307 +1321 @@
         window.clearTimeout(heartbeatTimer);
 ;;;     self.logger.debug('clearing heartbeatTimer', heartbeatTimer)
-        heartbeatTimer = window.setTimeout(function() { 
+        try {
+            heartbeatTimer = window.setTimeout(function() { 
 ;;;         self.logger.debug('timer', testtimer, 'did it'); 
-            heartbeatTimeout();
-        }, Orbited.settings.HEARTBEAT_TIMEOUT);
+                heartbeatTimeout();
+            }, Orbited.settings.HEARTBEAT_TIMEOUT);
+        }
+        catch(e) {
+            
+            return
+        }
         var testtimer = heartbeatTimer;