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

svn changeset:8361/svn branch:6.0
---
 .../gwt/server/AbstractApplicationServlet.java | 18 ++++++++++--------
 .../gwt/server/ApplicationPortlet.java         |  5 ++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index a889f415e8..adfbcda2dd 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -1355,10 +1355,11 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
                     + new Date().getTime() + "'></script>\n");
             page.write("<script type=\"text/javascript\">\n");
             page.write("//<![CDATA[\n");
-            page.write("if(!vaadin || !vaadin.vaadinConfigurations) {\n "
-                    + "if(!vaadin) { var vaadin = {}} \n"
-                    + "vaadin.vaadinConfigurations = {};\n"
-                    + "vaadin.themesLoaded = {}};\n");
+            page
+                    .write("if(!vaadin || !vaadin.vaadinConfigurations) {\n "
+                            + "if(!vaadin) { var vaadin = {}} \n"
+                            + "vaadin.vaadinConfigurations = {};\n"
+                            + "if (!vaadin.themesLoaded) { vaadin.themesLoaded = {}; } }\n");
 
             if (!isProductionMode()) {
                 page.write("vaadin.debug = true;\n");
@@ -1421,10 +1422,11 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
         } else {
             page.write("<script type=\"text/javascript\">\n");
             page.write("//<![CDATA[\n");
-            page.write("if(!vaadin || !vaadin.vaadinConfigurations) {\n "
-                    + "if(!vaadin) { var vaadin = {}} \n"
-                    + "vaadin.vaadinConfigurations = {};\n"
-                    + "vaadin.themesLoaded = {};\n");
+            page
+                    .write("if(!vaadin || !vaadin.vaadinConfigurations) {\n "
+                            + "if(!vaadin) { var vaadin = {}} \n"
+                            + "vaadin.vaadinConfigurations = {};\n"
+                            + "if (!vaadin.themesLoaded) { vaadin.themesLoaded = {}; }\n");
             if (!isProductionMode()) {
                 page.write("vaadin.debug = true;\n");
             }
diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
index 10bc3932dc..755994577d 100644
--- a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
@@ -146,8 +146,6 @@ public class ApplicationPortlet implements Portlet, Serializable {
                             portalTheme);
                 }
 
-                dispatcher.include(request, response);
-
                 /*
                  * Make sure portal default Vaadin theme is included exactly
                  * once in DOM.
@@ -158,7 +156,6 @@ 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
@@ -176,6 +173,8 @@ public class ApplicationPortlet implements Portlet, Serializable {
                     out.write(loadDefaultTheme.getBytes());
                 }
 
+                dispatcher.include(request, response);
+
                 if (isLifeRay) {
                     /*
                      * Temporary support to heartbeat Liferay session when using
-- 
2.39.5