Merge changes from origin/7.1

9c29442 Replace SelectionRangeDragging TB2 test with TB3 test
9fa230d Avoid eagerly layouting from VScrollTable.updateFromUIDL (#13188)

Change-Id: I4f1395a13e8b1eae44a0030a3679475a3db9160a

3 files changed, 16 insertions, 1 deletions

diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index 50cf44bc63..0e836907db 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -6720,8 +6720,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                 }
                 int heightBefore = getOffsetHeight();
                 scrollBodyPanel.setHeight(bodyHeight + "px");
+
                 if (heightBefore != getOffsetHeight()) {
-                    Util.notifyParentOfSizeChange(VScrollTable.this, false);
+                    Util.notifyParentOfSizeChange(VScrollTable.this, rendering);
                 }
             }
             Scheduler.get().scheduleDeferred(new Command() {
diff --git a/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java b/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java
index 243c7019e5..5a42484b28 100644
--- a/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java
+++ b/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java
@@ -48,7 +48,12 @@ public class TreeTableConnector extends TableConnector {
                 .getIntAttribute(TreeTableConstants.ATTRIBUTE_HIERARCHY_COLUMN_INDEX)
                 : 0;
         int oldTotalRows = getWidget().getTotalRows();
+
         super.updateFromUIDL(uidl, client);
+        // super.updateFromUIDL set rendering to false, even though we continue
+        // rendering here. Set it back to true.
+        getWidget().rendering = true;
+
         if (getWidget().collapseRequest) {
             if (getWidget().collapsedRowKey != null
                     && getWidget().scrollBody != null) {
@@ -105,6 +110,7 @@ public class TreeTableConnector extends TableConnector {
             getWidget()
                     .handleNavigation(event.keycode, event.ctrl, event.shift);
         }
+        getWidget().rendering = false;
     }
 
     @Override
diff --git a/client/src/com/vaadin/client/ui/window/WindowConnector.java b/client/src/com/vaadin/client/ui/window/WindowConnector.java
index 3ca4064659..5c8f5e2d2d 100644
--- a/client/src/com/vaadin/client/ui/window/WindowConnector.java
+++ b/client/src/com/vaadin/client/ui/window/WindowConnector.java
@@ -15,6 +15,8 @@
  */
 package com.vaadin.client.ui.window;
 
+import java.util.logging.Logger;
+
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.dom.client.Style;
@@ -256,6 +258,12 @@ public class WindowConnector extends AbstractSingleComponentContainerConnector
     @Override
     public void postLayout() {
         VWindow window = getWidget();
+
+        if (!window.isAttached()) {
+            Logger.getLogger(WindowConnector.class.getName()).warning(
+                    "Called postLayout to detached Window.");
+            return;
+        }
         if (window.centered && getState().windowMode != WindowMode.MAXIMIZED) {
             window.center();
         }