#3113 corrected: load portal default theme before any others

svn changeset:8361/svn branch:6.0

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index a889f415e8798cb8e5e442e0ef2f015e4fb8957c..adfbcda2dd6cbc30b44f3562ddd81d4d7a937384 100644 (file)
--- 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 10bc3932dc89edd171780450dc5766908c2a1287..755994577d09a3ed428b67539b5034bf7f34f12b 100644 (file)
--- 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);\r
                 }\r
 \r
-                dispatcher.include(request, response);\r
-\r
                 /*\r
                  * Make sure portal default Vaadin theme is included exactly\r
                  * once in DOM.\r
@@ -158,7 +156,6 @@ public class ApplicationPortlet implements Portlet, Serializable {
                     // Using portal-wide theme\r
                     String loadDefaultTheme = ("<script type=\"text/javascript\">\n"\r
                             + "if(!vaadin) { var vaadin = {} } \n"\r
-                            + "if(!vaadin.vaadinConfigurations) { vaadin.vaadinConfigurations = {} } \n"\r
                             + "if(!vaadin.themesLoaded) { vaadin.themesLoaded = {} } \n"\r
                             + "if(!vaadin.themesLoaded['"\r
                             + portalTheme\r
@@ -176,6 +173,8 @@ public class ApplicationPortlet implements Portlet, Serializable {
                     out.write(loadDefaultTheme.getBytes());\r
                 }\r
 \r
+                dispatcher.include(request, response);\r
+\r
                 if (isLifeRay) {\r
                     /*\r
                      * Temporary support to heartbeat Liferay session when using\r