aboutsummaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-08-29 15:46:54 +0300
committerLeif Åstrand <leif@vaadin.com>2013-08-30 08:13:54 +0300
commitbea7fa3430c6f90013e2c9178841120ff3097b1a (patch)
tree17f27465c9678f1b29bd974282fe76c6624f973c /client
parent6dc46c5cfc66defaa7ed2350f20bf2224b419d82 (diff)
downloadvaadin-framework-bea7fa3430c6f90013e2c9178841120ff3097b1a.tar.gz
vaadin-framework-bea7fa3430c6f90013e2c9178841120ff3097b1a.zip
Only consider caption tooltips for own slots (#12469)
Change-Id: I2d804b460fbca7cb7dbea01c88ae3dc7e63f344d
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java1
1 files changed, 1 insertions, 0 deletions
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());