Provide context path to comet session reload function

lift · Aug 25, 2017 · fa78d52 · fa78d52
1 parent fe37149
commit fa78d52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/web/webkit/src/main/resources/toserve/lift.js b/web/webkit/src/main/resources/toserve/lift.js
@@ -76,8 +76,12 @@
       },
       cometGetTimeout: 140000,
       cometFailureRetryTimeout: 10000,
-      cometOnSessionLost: function() {
-        window.location.href = "/";
+      cometOnSessionLost: function(contextPath) {
+        if (contextPath === null || contextPath === undefined) {
+          window.location.href = "/";
+        } else {
+          window.location.href = contextPath;
+        }
       },
       cometServer: null,
       cometOnError: function(e) {
@@ -711,7 +715,7 @@
       if (typeof elementOrId === 'string') {
         element = document.getElementById(elementOrId);
       }
-      
+
       // This is a Lift addition to allow return false to properly do
       // cross-browser preventDefault/stopPropagation/etc work.
       function normalizeEventReturn(event) {
@@ -722,7 +726,7 @@
             event.stopPropagation();
           }
         }
-        
+
         return result;
       }
 

diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala
@@ -775,7 +775,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
    * lift.cometOnSessionLost reloads the current page by default.
    */
   val noCometSessionCmd = new FactoryMaker[JsCmd](
-    () => JsCmds.Run("lift.cometOnSessionLost()")
+    () => JsCmds.Run(s"lift.cometOnSessionLost('${S.contextPath}')")
   ) {}
 
   /**