diff options
author | Leif Åstrand <leif@vaadin.com> | 2013-05-07 15:45:51 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2013-05-07 12:59:11 +0000 |
commit | 571792ed9ddb00ae795bd785473c181f1aa102a2 (patch) | |
tree | 477265d9aa2c01c0da86cce8cfc03fb58934b47c /client | |
parent | f2c2236cf8d0428f100e17586f7946095ffea158 (diff) | |
download | vaadin-framework-571792ed9ddb00ae795bd785473c181f1aa102a2.tar.gz vaadin-framework-571792ed9ddb00ae795bd785473c181f1aa102a2.zip |
Remove old widget hierarchy hack that caused problems (#11752)
Change-Id: Icd66755512a2c1ab490e58f80389ed35966d3e3b
Diffstat (limited to 'client')
-rw-r--r-- | client/src/com/vaadin/client/ui/VPopupView.java | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/client/src/com/vaadin/client/ui/VPopupView.java b/client/src/com/vaadin/client/ui/VPopupView.java index d983da2b62..05fbd2c073 100644 --- a/client/src/com/vaadin/client/ui/VPopupView.java +++ b/client/src/com/vaadin/client/ui/VPopupView.java @@ -202,7 +202,6 @@ public class VPopupView extends HTML implements Iterable<Widget> { private boolean hasHadMouseOver = false; private boolean hideOnMouseOut = true; private final Set<Element> activeChildren = new HashSet<Element>(); - private boolean hiding = false; private ShortcutActionHandler shortcutActionHandler; @@ -264,7 +263,6 @@ public class VPopupView extends HTML implements Iterable<Widget> { @Override public void hide(boolean autoClosed) { VConsole.log("Hiding popupview"); - hiding = true; syncChildren(); if (popupComponentWidget != null && popupComponentWidget != loading) { remove(popupComponentWidget); @@ -276,8 +274,6 @@ public class VPopupView extends HTML implements Iterable<Widget> { @Override public void show() { - hiding = false; - // Find the shortcut action handler that should handle keyboard // events from the popup. The events do not propagate automatically // because the popup is directly attached to the RootPanel. @@ -353,31 +349,6 @@ public class VPopupView extends HTML implements Iterable<Widget> { this.hideOnMouseOut = hideOnMouseOut; } - /* - * - * We need a hack make popup act as a child of VPopupView in Vaadin's - * component tree, but work in default GWT manner when closing or - * opening. - * - * (non-Javadoc) - * - * @see com.google.gwt.user.client.ui.Widget#getParent() - */ - @Override - public Widget getParent() { - if (!isAttached() || hiding) { - return super.getParent(); - } else { - return VPopupView.this; - } - } - - @Override - protected void onDetach() { - super.onDetach(); - hiding = false; - } - @Override public Element getContainerElement() { return super.getContainerElement(); |