Only consider caption tooltips for own slots (#12469)

author Leif Åstrand <leif@vaadin.com>

Thu, 29 Aug 2013 12:46:54 +0000 (15:46 +0300)

committer Leif Åstrand <leif@vaadin.com>

Fri, 30 Aug 2013 05:13:54 +0000 (08:13 +0300)
author Leif Åstrand <leif@vaadin.com>
Thu, 29 Aug 2013 12:46:54 +0000 (15:46 +0300)
committer Leif Åstrand <leif@vaadin.com>
Fri, 30 Aug 2013 05:13:54 +0000 (08:13 +0300)
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java

index 45cc18f3dc581c275711dbe9f69faddf6005224e..e0dc0d51df1d0ac43a56c1cb2628a2909dc06c48 100644 (file)
--- 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 (file)

index 0000000..4f574a9
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionTooltip.html
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.applicationcontext.CloseSession?restartApplication&amp;debug</td>
+       <td></td>
+</tr>
+<!-- Show tooltip for the Events caption -->
+<tr>
+       <td>showTooltip</td>
+       <td>//div[@id='gwt-uid-4']/span</td>
+       <td></td>
+</tr>
+<!-- Verify that there's no error notification -->
+<tr>
+       <td>assertElementNotPresent</td>
+       <td>vaadin=runcomvaadintestsapplicationcontextCloseSession::Root/VNotification[0]</td>
+       <td></td>
+</tr>
+</tbody></table>
+</body>
+</html>
author	Leif Åstrand <leif@vaadin.com>
	Thu, 29 Aug 2013 12:46:54 +0000 (15:46 +0300)
committer	Leif Åstrand <leif@vaadin.com>
	Fri, 30 Aug 2013 05:13:54 +0000 (08:13 +0300)
client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java		patch \| blob \| history
uitest/src/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionTooltip.html	[new file with mode: 0644]	patch \| blob