From dbd40d5dd80f4ea7a0504e451837b5e970c5f0d5 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Thu, 9 Jul 2009 13:02:36 +0000
Subject: [PATCH] #3113 load portal default theme before any others

svn changeset:8360/svn branch:6.0
---
 .../gwt/server/ApplicationPortlet.java        | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
index 23547297c4..10bc3932dc 100644
--- a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
@@ -148,31 +148,6 @@ public class ApplicationPortlet implements Portlet, Serializable {
 
                 dispatcher.include(request, response);
 
-                if (isLifeRay) {
-                    /*
-                     * Temporary support to heartbeat Liferay session when using
-                     * Vaadin based portlet. We hit an extra xhr to liferay
-                     * servlet to extend the session lifetime after each Vaadin
-                     * request. This hack can be removed when supporting portlet
-                     * 2.0 and resourceRequests.
-                     * 
-                     * TODO make this configurable, this is not necessary with
-                     * some custom session configurations.
-                     */
-                    OutputStream out = response.getPortletOutputStream();
-
-                    String lifeRaySessionHearbeatHack = ("<script type=\"text/javascript\">"
-                            + "if(!vaadin.postRequestHooks) {"
-                            + "    vaadin.postRequestHooks = {};"
-                            + "}"
-                            + "vaadin.postRequestHooks.liferaySessionHeartBeat = function() {"
-                            + "    if (Liferay && Liferay.Session) {"
-                            + "        Liferay.Session.extend();"
-                            + "    }"
-                            + "};" + "</script>");
-                    out.write(lifeRaySessionHearbeatHack.getBytes());
-                }
-
                 /*
                  * Make sure portal default Vaadin theme is included exactly
                  * once in DOM.
@@ -182,6 +157,9 @@ public class ApplicationPortlet implements Portlet, Serializable {
 
                     // Using portal-wide theme
                     String loadDefaultTheme = ("<script type=\"text/javascript\">\n"
+                            + "if(!vaadin) { var vaadin = {} } \n"
+                            + "if(!vaadin.vaadinConfigurations) { vaadin.vaadinConfigurations = {} } \n"
+                            + "if(!vaadin.themesLoaded) { vaadin.themesLoaded = {} } \n"
                             + "if(!vaadin.themesLoaded['"
                             + portalTheme
                             + "']) {\n"
@@ -198,6 +176,31 @@ public class ApplicationPortlet implements Portlet, Serializable {
                     out.write(loadDefaultTheme.getBytes());
                 }
 
+                if (isLifeRay) {
+                    /*
+                     * Temporary support to heartbeat Liferay session when using
+                     * Vaadin based portlet. We hit an extra xhr to liferay
+                     * servlet to extend the session lifetime after each Vaadin
+                     * request. This hack can be removed when supporting portlet
+                     * 2.0 and resourceRequests.
+                     * 
+                     * TODO make this configurable, this is not necessary with
+                     * some custom session configurations.
+                     */
+                    OutputStream out = response.getPortletOutputStream();
+
+                    String lifeRaySessionHearbeatHack = ("<script type=\"text/javascript\">"
+                            + "if(!vaadin.postRequestHooks) {"
+                            + "    vaadin.postRequestHooks = {};"
+                            + "}"
+                            + "vaadin.postRequestHooks.liferaySessionHeartBeat = function() {"
+                            + "    if (Liferay && Liferay.Session) {"
+                            + "        Liferay.Session.extend();"
+                            + "    }"
+                            + "};" + "</script>");
+                    out.write(lifeRaySessionHearbeatHack.getBytes());
+                }
+
             } catch (PortletException e) {
                 PrintWriter out = response.getWriter();
                 out.print("<h1>Servlet include failed!</h1>");
-- 
2.39.5