Merge pull request #1914 from lift/3.0.2-comet-reload-context-path

[3.0.2] Comet reload context path

Author: farmdawgnation

contributors.md

@@ -233,3 +233,9 @@ Seth Tisue
 
 ### Email: ###
 seth at tisue dot net
+
+### Name: ###
+Josef Vlach
+
+### Email: ###
+vlach.josef at gmail dot com

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) {
@@ -600,8 +600,8 @@
       },
       calcAjaxUrl: calcAjaxUrl,
       registerComets: registerComets,
-      cometOnSessionLost: function() {
-        settings.cometOnSessionLost();
+      cometOnSessionLost: function(contextPath) {
+        settings.cometOnSessionLost(contextPath);
       },
       cometOnError: function(e) {
         settings.cometOnError(e);

web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala

@@ -766,7 +766,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("'", "\\'")}')")
   ) {}
 
   /**