From 6a091ed8dd5482ad0a258d8cd6bb69b18609f598 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Fri, 6 May 2016 13:00:24 +0300 Subject: Fix IE focus fix which has been broken since 7.0.0 (#19789, #7965) Change-Id: I268f4b5c1cb1a2fcc627a814e673a7553afa3927 --- client/src/com/vaadin/client/ui/VScrollTable.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java index 8bdafb9073..479fffc741 100644 --- a/client/src/com/vaadin/client/ui/VScrollTable.java +++ b/client/src/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. -- cgit v1.2.3