From: Artur Signell <artur@vaadin.com>
Date: Sun, 17 Apr 2016 15:58:59 +0000 (+0300)
Subject: Fix IE focus fix which has been broken since 7.0.0 (#7965)
X-Git-Tag: 7.7.0.alpha2~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e5addd7eb2cddaaea7d5c74e6e435ca4f854e915;p=vaadin-framework.git

Fix IE focus fix which has been broken since 7.0.0 (#7965)

Change-Id: Ia0aee645ed3b0ba6de33a6a2ce9f8bde9b84f44f
---

diff --git a/client/src/main/java/com/vaadin/client/ui/VScrollTable.java b/client/src/main/java/com/vaadin/client/ui/VScrollTable.java
index 8bdafb9073..479fffc741 100644
--- a/client/src/main/java/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/main/java/com/vaadin/client/ui/VScrollTable.java
@@ -8005,9 +8005,11 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
              * handler is still active. (#10464)
              */
             Element focusedElement = WidgetUtil.getFocusedElement();
-            if (Util.getConnectorForElement(client, getParent(), focusedElement) == this
-                    && focusedElement != null
-                    && focusedElement != scrollBodyPanel.getFocusElement()) {
+            if (focusedElement != null
+                    && focusedElement != scrollBodyPanel.getFocusElement()
+                    && Util.getConnectorForElement(client, getParent(),
+                            focusedElement) == ConnectorMap.get(client)
+                            .getConnector(this)) {
                 /*
                  * Steal focus back to the focus handler if it was moved to some
                  * other part of the table. Avoid stealing focus in other cases.