Merge pull request #1903 from lift/msf_issue_1901

Provide context path to comet session reload function
lift · Sep 13, 2017 · dfab883 · dfab883
2 parents d5d34cb + d506eb4
commit dfab883
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/contributors.md b/contributors.md
@@ -264,8 +264,15 @@ Riccardo Sirigu
 ### Email: ###
 me at riccardosirigu dot com
 
+### Name: ###
+Josef Vlach
+
+### Email: ###
+vlach.josef at gmail dot com
+
 ### Name: ###
 Noel Kennedy
 
 ### Email: ###
 nkennedy at rvc dot ac dot uk
+
diff --git a/web/webkit/src/main/resources/toserve/lift.js b/web/webkit/src/main/resources/toserve/lift.js
@@ -76,8 +76,8 @@
       },
       cometGetTimeout: 140000,
       cometFailureRetryTimeout: 10000,
-      cometOnSessionLost: function() {
-        window.location.href = "/";
+      cometOnSessionLost: function(contextPath) {
+        window.location.href = contextPath || "/";
       },
       cometServer: null,
       cometOnError: function(e) {
@@ -602,8 +602,8 @@
       },
       calcAjaxUrl: calcAjaxUrl,
       registerComets: registerComets,
-      cometOnSessionLost: function() {
-        settings.cometOnSessionLost();
+      cometOnSessionLost: function(contextPath) {
+        settings.cometOnSessionLost(contextPath);
       },
       cometOnError: function(e) {
         settings.cometOnError(e);
@@ -711,7 +711,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 +722,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
@@ -776,7 +776,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.replace("'", "\\'")}')")
   ) {}
 
   /**