Potential fix for #6685 High CPU usage for any Vaadin application in IE9 - Moved...

svn changeset:17907/svn branch:6.5

diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css
index 4e0747538c9d584d6f4e89c5692506885ef43a96..27bc57dd00f792fd6c5b565c5d5e4ad6b5a4c793 100644 (file)
--- a/WebContent/VAADIN/themes/base/common/common.css
+++ b/WebContent/VAADIN/themes/base/common/common.css
@@ -23,6 +23,8 @@ div.v-app-loading {
        background-image: url(img/loading-indicator.gif);
        background-repeat: no-repeat;
        background-position: 50%;
+       width: 100%;
+       height: 100%;
 }
 .v-view {
        height: 100%;

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 0d5e79acbfc4984eae2c530271dbee2c4778a476..875df0b097439401f71997a53fc78cda80808273 100644 (file)
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_2_dev-20110303";}
-.v-theme-version-6_5_2_dev-20110303 {display: none;}
+.v-theme-version:after {content:"6_5_4_dev-20110324";}
+.v-theme-version-6_5_4_dev-20110324 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -276,6 +276,8 @@ div.v-app-loading {
        background-image: url(common/img/loading-indicator.gif);
        background-repeat: no-repeat;
        background-position: 50%;
+       width: 100%;
+       height: 100%;
 }
 .v-view {
        height: 100%;

diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index 115119e79728aeb8a911da89b85945eca6e90c88..4dbf9aafff920231f305a4d4f1e57128228f02c2 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/styles.css
+++ b/WebContent/VAADIN/themes/liferay/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_2_dev-20110303";}
-.v-theme-version-6_5_2_dev-20110303 {display: none;}
+.v-theme-version:after {content:"6_5_4_dev-20110324";}
+.v-theme-version-6_5_4_dev-20110324 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -276,6 +276,8 @@ div.v-app-loading {
        background-image: url(../base/common/img/loading-indicator.gif);
        background-repeat: no-repeat;
        background-position: 50%;
+       width: 100%;
+       height: 100%;
 }
 .v-view {
        height: 100%;

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index b0c54c8ec4058380005f6a1d231b05f3e00ae4af..e960a6abeaa759fd3bdb0584625ceee72845d532 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_2_dev-20110303";}
-.v-theme-version-6_5_2_dev-20110303 {display: none;}
+.v-theme-version:after {content:"6_5_4_dev-20110324";}
+.v-theme-version-6_5_4_dev-20110324 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -276,6 +276,8 @@ div.v-app-loading {
        background-image: url(../base/common/img/loading-indicator.gif);
        background-repeat: no-repeat;
        background-position: 50%;
+       width: 100%;
+       height: 100%;
 }
 .v-view {
        height: 100%;

diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 120c4daa53c07ce338c68cb6d56f6b5e6d052e59..326f0525cfee67617cc1d91d1408467a5b32867b 100644 (file)
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_2_dev-20110303";}
-.v-theme-version-6_5_2_dev-20110303 {display: none;}
+.v-theme-version:after {content:"6_5_4_dev-20110324";}
+.v-theme-version-6_5_4_dev-20110324 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -276,6 +276,8 @@ div.v-app-loading {
        background-image: url(../base/common/img/loading-indicator.gif);
        background-repeat: no-repeat;
        background-position: 50%;
+       width: 100%;
+       height: 100%;
 }
 .v-view {
        height: 100%;

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java
index 5d7cc1894599762b83230e07455cf0638c74ba8c..70b5388405112f5bd38efb115ab87bdb77f4918a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java
@@ -675,6 +675,11 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
         DOM.setElementProperty(getElement(), "tabIndex", "1");
 
         RootPanel root = RootPanel.get(rootPanelId);
+        Element rootElement = root.getElement();
+        if (rootElement.getChildCount() == 1) {
+            // Remove any "v-app-loading" div
+            rootElement.getChild(0).removeFromParent();
+        }
         root.add(this);
         root.removeStyleName("v-app-loading");
 
@@ -708,7 +713,7 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
     }
 
     public void focus() {
-        getElement().focus();       
+        getElement().focus();
     }
 
 }

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 5f06285b1f7afb88d77358e6f0a27811d971deab..a50cf3290a1dfdefd71e1da02f2f05f07090fee1 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -1660,7 +1660,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                     + getDefaultTheme().replaceAll("[^a-zA-Z0-9]", "");
         }
 
-        String classNames = "v-app v-app-loading " + themeClass + " "
+        String classNames = "v-app " + themeClass + " "
                 + appClass;
 
         String divStyle = null;
@@ -1744,7 +1744,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
             String appId, String classNames, String divStyle, HttpServletRequest request)
             throws IOException {
         page.write("<div id=\"" + appId + "\" class=\"" + classNames + "\" "
-                + (divStyle != null ? divStyle : "") + "></div>\n");
+                + (divStyle != null ? divStyle : "") + ">");
+        page.write("<div class=\"v-app-loading\"></div>");
+        page.write("</div>\n");
         page.write("<noscript>" + getNoScriptMessage() + "</noscript>");
     }