summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-08-26 21:29:04 +0300
committerLeif Åstrand <leif@vaadin.com>2014-08-27 17:03:22 +0300
commitaea7ad1b79e2582b888b7238334aab0e49547f45 (patch)
tree61006ab0bfb7b9f1a26f438b5bfc4c71ee951680 /client
parent4bf34a758130d0c3129c503df6bcd26324715e02 (diff)
downloadvaadin-framework-aea7ad1b79e2582b888b7238334aab0e49547f45.tar.gz
vaadin-framework-aea7ad1b79e2582b888b7238334aab0e49547f45.zip
Add theme class name in init to prevent delay for embedded apps (#14517)
Change-Id: I73bf41ca493f76d0a4caa82464ef3c63b3d7f055
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/ui/UIConnector.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java
index c88fd23eca..d6f14bf158 100644
--- a/client/src/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java
@@ -494,7 +494,11 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
// the user
root.getElement().setInnerHTML("");
+ // Activate the initial theme by only adding the class name. Not calling
+ // activateTheme here as it will also cause a full layout and updates to
+ // the overlay container which has not yet been created at this point
activeTheme = applicationConnection.getConfiguration().getThemeName();
+ root.addStyleName(activeTheme);
root.add(getWidget());