diff options
| author | Henri Sara <hesara@vaadin.com> | 2016-05-06 13:00:24 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2016-05-06 13:00:24 +0300 |
| commit | 6a091ed8dd5482ad0a258d8cd6bb69b18609f598 (patch) | |
| tree | 7f1f0c306ae69a2d1683305166052b1ad62f0d18 | |
| parent | 094f57b514bf24b5f907fef8c605665691cdac89 (diff) | |
| download | vaadin-framework-6a091ed8dd5482ad0a258d8cd6bb69b18609f598.tar.gz vaadin-framework-6a091ed8dd5482ad0a258d8cd6bb69b18609f598.zip | |
Fix IE focus fix which has been broken since 7.0.0 (#19789, #7965)
Change-Id: I268f4b5c1cb1a2fcc627a814e673a7553afa3927
| -rw-r--r-- | client/src/com/vaadin/client/ui/VScrollTable.java | 8 |
1 files 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. |