summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-01-15 09:17:19 +0000
committerVaadin Code Review <review@vaadin.com>2013-01-15 09:17:19 +0000
commitd8c9b399e5913343007df9fb53f109d89b66943c (patch)
tree36f295019f271255956686a8b9a7036a490e6a75
parent7413385a7cc0e87ec8d35574963113d3c58af5ec (diff)
parentb36f35ec5ad8fb7a602c33d56732c47c818c7864 (diff)
downloadvaadin-framework-d8c9b399e5913343007df9fb53f109d89b66943c.tar.gz
vaadin-framework-d8c9b399e5913343007df9fb53f109d89b66943c.zip
Merge "Always measure errorMessage to get a resize event when it is removed (#10589)"
-rw-r--r--client/src/com/vaadin/client/ui/form/FormConnector.java22
1 files changed, 8 insertions, 14 deletions
diff --git a/client/src/com/vaadin/client/ui/form/FormConnector.java b/client/src/com/vaadin/client/ui/form/FormConnector.java
index 61a38e74ba..b87faf7b30 100644
--- a/client/src/com/vaadin/client/ui/form/FormConnector.java
+++ b/client/src/com/vaadin/client/ui/form/FormConnector.java
@@ -72,12 +72,16 @@ public class FormConnector extends AbstractComponentContainerConnector
};
@Override
+ protected void init() {
+ getLayoutManager().addElementResizeListener(
+ getWidget().errorMessage.getElement(), footerResizeListener);
+ };
+
+ @Override
public void onUnregister() {
VForm form = getWidget();
- if (form.errorMessage.isVisible()) {
- getLayoutManager().removeElementResizeListener(
- form.errorMessage.getElement(), footerResizeListener);
- }
+ getLayoutManager().removeElementResizeListener(
+ form.errorMessage.getElement(), footerResizeListener);
if (form.footer != null) {
getLayoutManager().removeElementResizeListener(
form.footer.getElement(), footerResizeListener);
@@ -125,18 +129,8 @@ public class FormConnector extends AbstractComponentContainerConnector
if (null != getState().errorMessage) {
getWidget().errorMessage.updateMessage(getState().errorMessage);
- if (!getWidget().errorMessage.isVisible()) {
- getLayoutManager().addElementResizeListener(
- getWidget().errorMessage.getElement(),
- footerResizeListener);
- }
getWidget().errorMessage.setVisible(true);
} else {
- if (getWidget().errorMessage.isVisible()) {
- getLayoutManager().removeElementResizeListener(
- getWidget().errorMessage.getElement(),
- footerResizeListener);
- }
getWidget().errorMessage.setVisible(false);
}