Merge branch 'master' of ssh://github.com/urweb/urweb

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/js/urweb.js b/lib/js/urweb.js
index 96a12637..1f44a97b 100644
--- a/lib/js/urweb.js
+++ b/lib/js/urweb.js
@@ -1704,10 +1704,11 @@ function newChannel() {
 function listener() {
     var uri = path_join(url_prefix, ".msgs");
     var xhr = getXHR();
-    var tid, orsc, onTimeout;
+    var tid, orsc, onTimeout, lastTick;
 
     var connect = function () {
         xhr.onreadystatechange = orsc;
+        lastTick = new Date().getTime();
         tid = window.setTimeout(onTimeout, timeout * 500);
         requestUri(xhr, uri, false, false);
     }
@@ -1797,8 +1798,19 @@ function listener() {
     };
 
     onTimeout = function() {
+        var thisTick = new Date().getTime();
         xhrFinished(xhr);
-        connect();
+
+        if (thisTick - lastTick > timeout * 1000) {
+            if (confirm("The session for this page has expired.  Please choose \"OK\" to reload.")) {
+                if (isPost)
+                    history.back();
+                else
+                    location.reload();
+            }
+        } else {
+            connect();
+        }
     };
 
     connect();