Actually show loading indicator during loading (#12128)

* Add theme name already during bootstrap

Change-Id: I78da3029b818ced51714d385cd77f5ba9bfce625

diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index 48890488fb8a5a3af7209d08bc00fbcd3b14950c..c32116cda8441cbc70573951ba0b838f115fd2d1 100644 (file)
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -11,7 +11,7 @@
 .v-caption {
        cursor: default;
 }
-body &.v-app-loading {
+body &.v-app .v-app-loading {
        /* You can use this to provide indication for the user that the application is loading. */
        /* It is applied to the same element as .v-app */
        background-image: url(img/loading-indicator.gif);

diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java
index dddfb385a6c90f9337afccd0ddc7c9dce24921c0..b21fdb0b744fb9d919a852b0fc71af4ebf297c0f 100644 (file)
--- a/server/src/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/server/BootstrapHandler.java
@@ -363,6 +363,7 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
         Element mainDiv = new Element(Tag.valueOf("div"), "");
         mainDiv.attr("id", context.getAppId());
         mainDiv.addClass("v-app");
+        mainDiv.addClass(context.getThemeName());
         if (style != null && style.length() != 0) {
             mainDiv.attr("style", style);
         }