diff options
| author | Artur Signell <artur@vaadin.com> | 2016-04-17 18:58:59 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-04-28 15:33:55 +0000 |
| commit | e5addd7eb2cddaaea7d5c74e6e435ca4f854e915 (patch) | |
| tree | 5ed06313aba82f7aedbe6ca11bb981131f239996 /client/src | |
| parent | 0b0495b6d87b3c623b38643ff1ce27abf5a30d5c (diff) | |
| download | vaadin-framework-e5addd7eb2cddaaea7d5c74e6e435ca4f854e915.tar.gz vaadin-framework-e5addd7eb2cddaaea7d5c74e6e435ca4f854e915.zip | |
Fix IE focus fix which has been broken since 7.0.0 (#7965)
Change-Id: Ia0aee645ed3b0ba6de33a6a2ce9f8bde9b84f44f
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/main/java/com/vaadin/client/ui/VScrollTable.java | 8 |
1 files changed, 5 insertions, 3 deletions
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. |