myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject [myfaces-tobago] branch master updated: Demo: * cleanup theme handling
Date Fri, 13 Oct 2017 12:42:02 GMT
This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new 0fb9cf8  Demo: * cleanup theme handling
0fb9cf8 is described below

commit 0fb9cf86a89efbe7ca688de252b4de69823553ee
Author: Udo Schnurpfeil <lofwyr@apache.org>
AuthorDate: Fri Oct 13 14:41:56 2017 +0200

    Demo:
    * cleanup theme handling
---
 .../java/org/apache/myfaces/tobago/internal/util/CookieUtils.java    | 2 --
 .../src/main/java/org/apache/myfaces/tobago/example/demo/Login.java  | 5 +++++
 tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml        | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
index ad391b1..318bd25 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
@@ -102,7 +102,6 @@ public class CookieUtils {
     }
   }
 
-/*
   public static void removeThemeNameCookie(
       HttpServletRequest request, HttpServletResponse response) {
 
@@ -119,5 +118,4 @@ public class CookieUtils {
       }
     }
   }
-*/
 }
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java
b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java
index a528935..a0c8bae 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java
@@ -73,6 +73,11 @@ public class Login {
       session.invalidate();
     }
     final ExternalContext externalContext = facesContext.getExternalContext();
+/* XXX reset theme doesn't work
+    CookieUtils.removeThemeNameCookie(
+        (HttpServletRequest)externalContext.getRequest(),
+        (HttpServletResponse) externalContext.getResponse());
+*/
     externalContext.redirect(externalContext.getRequestContextPath() + "/");
     facesContext.responseComplete();
     return null;
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
index 01cc8da..5411f9c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
@@ -48,7 +48,7 @@
                 <tc:selectItems value="#{themeController.themeItems}"/>
               </tc:selectOneRadio>
             </tc:link>
-            <!--<tc:link action="#{clientConfigController.resetTheme}" label="Reset
Theme"/>-->
+            <!--<tc:link action="#{themeController.resetTheme}" label="Reset Theme"/>-->
             <tc:link label="#{demoBundle.menu_locale}">
               <tc:selectOneRadio value="#{localeController.locale}">
                 <tc:event action="#{localeController.submit}"/>

-- 
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <commits@myfaces.apache.org>'].

Mime
View raw message