summaryrefslogtreecommitdiffstats
path: root/compatibility-client/src
diff options
context:
space:
mode:
authorSebastian Nyholm <sebastian@vaadin.com>2016-09-26 14:24:12 +0300
committerPekka Hyvönen <pekka@vaadin.com>2016-12-09 09:39:00 +0200
commit7b39a6dd527e80499261d1e93a48af9ab629f25c (patch)
tree571987b2b26514456dc274c5dfdcd9ca79d23da7 /compatibility-client/src
parent22063cfe1a027057e523ccd85937162af43edfd8 (diff)
downloadvaadin-framework-7b39a6dd527e80499261d1e93a48af9ab629f25c.tar.gz
vaadin-framework-7b39a6dd527e80499261d1e93a48af9ab629f25c.zip
Fixes VTree so that you can click sub elements when setHtmlContentAllowed is true. (#20097)
Change-Id: Ic453aaf16ea1d44792db868e04faaba069aab3b7
Diffstat (limited to 'compatibility-client/src')
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTree.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTree.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTree.java
index 8e22672641..12d76bec9f 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTree.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTree.java
@@ -825,7 +825,7 @@ public class VTree extends FocusElementPanel
*/
public boolean isCaptionElement(
com.google.gwt.dom.client.Element target) {
- return (target == nodeCaptionSpan
+ return (nodeCaptionSpan.isOrHasChild(target)
|| (icon != null && target == icon.getElement()));
}