From bea7fa3430c6f90013e2c9178841120ff3097b1a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Thu, 29 Aug 2013 15:46:54 +0300 Subject: [PATCH] Only consider caption tooltips for own slots (#12469) Change-Id: I2d804b460fbca7cb7dbea01c88ae3dc7e63f344d --- .../AbstractOrderedLayoutConnector.java | 1 + .../NestedLayoutCaptionTooltip.html | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 uitest/src/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionTooltip.html diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java index 45cc18f3dc..e0dc0d51df 100644 --- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java +++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java @@ -375,6 +375,7 @@ public abstract class AbstractOrderedLayoutConnector extends Slot slot = Util.findWidget( (com.google.gwt.user.client.Element) element, Slot.class); if (slot != null && slot.getCaptionElement() != null + && slot.getParent() == getWidget() && slot.getCaptionElement().isOrHasChild(element)) { ComponentConnector connector = Util.findConnectorFor(slot .getWidget()); diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionTooltip.html b/uitest/src/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionTooltip.html new file mode 100644 index 0000000000..4f574a92c7 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionTooltip.html @@ -0,0 +1,33 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.applicationcontext.CloseSession?restartApplication&debug
showTooltip//div[@id='gwt-uid-4']/span
assertElementNotPresentvaadin=runcomvaadintestsapplicationcontextCloseSession::Root/VNotification[0]
+ + -- 2.39.5