Make table take parent enable state changes into account (#19455)

Change-Id: I11d9e7bcdc3471157b9c21881d463ef5a747d2c1

1 files changed, 19 insertions, 14 deletions

diff --git a/client/src/com/vaadin/client/ui/table/TableConnector.java b/client/src/com/vaadin/client/ui/table/TableConnector.java
index a554b9335c..cfe93b6641 100644
--- a/client/src/com/vaadin/client/ui/table/TableConnector.java
+++ b/client/src/com/vaadin/client/ui/table/TableConnector.java
@@ -180,20 +180,6 @@ public class TableConnector extends AbstractFieldConnector implements
             return;
         }
 
-        getWidget().enabled = isEnabled();
-
-        if (BrowserInfo.get().isIE8() && !getWidget().enabled) {
-            /*
-             * The disabled shim will not cover the table body if it is relative
-             * in IE8. See #7324
-             */
-            getWidget().scrollBodyPanel.getElement().getStyle()
-                    .setPosition(Position.STATIC);
-        } else if (BrowserInfo.get().isIE8()) {
-            getWidget().scrollBodyPanel.getElement().getStyle()
-                    .setPosition(Position.RELATIVE);
-        }
-
         getWidget().paintableId = uidl.getStringAttribute("id");
         getWidget().immediate = getState().immediate;
 
@@ -399,6 +385,25 @@ public class TableConnector extends AbstractFieldConnector implements
     }
 
     @Override
+    public void updateEnabledState(boolean enabledState) {
+        super.updateEnabledState(enabledState);
+        getWidget().enabled = isEnabled();
+
+        if (BrowserInfo.get().isIE8() && !getWidget().enabled) {
+            /*
+             * The disabled shim will not cover the table body if it is relative
+             * in IE8. See #7324
+             */
+            getWidget().scrollBodyPanel.getElement().getStyle()
+                    .setPosition(Position.STATIC);
+        } else if (BrowserInfo.get().isIE8()) {
+            getWidget().scrollBodyPanel.getElement().getStyle()
+                    .setPosition(Position.RELATIVE);
+        }
+
+    }
+
+    @Override
     public VScrollTable getWidget() {
         return (VScrollTable) super.getWidget();
     }