diff options
| author | Artur Signell <artur@vaadin.com> | 2012-12-15 11:17:50 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-12-15 11:17:50 +0000 |
| commit | 74b4b0d2bc1657fa3c821c99fa1c7e313963cc3f (patch) | |
| tree | 927b28b15755a796c62a7154f2f68856e01daf24 | |
| parent | 309a7bfda59396d45afc61557d0ded2c262451d4 (diff) | |
| parent | 2a475b4bccc9e3b09d41e1f81469f750f21fbf30 (diff) | |
| download | vaadin-framework-74b4b0d2bc1657fa3c821c99fa1c7e313963cc3f.tar.gz vaadin-framework-74b4b0d2bc1657fa3c821c99fa1c7e313963cc3f.zip | |
Merge "Avoid attempting to use a DOM node as an element (#10480)"
| -rw-r--r-- | client/src/com/vaadin/client/ui/dd/VDragAndDropManager.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/dd/VDragAndDropManager.java b/client/src/com/vaadin/client/ui/dd/VDragAndDropManager.java index ae14218fff..ac1ae72877 100644 --- a/client/src/com/vaadin/client/ui/dd/VDragAndDropManager.java +++ b/client/src/com/vaadin/client/ui/dd/VDragAndDropManager.java @@ -84,7 +84,14 @@ public class VDragAndDropManager { currentDrag.setCurrentGwtEvent(nativeEvent); updateDragImagePosition(); - Element targetElement = Element.as(nativeEvent.getEventTarget()); + Node targetNode = Node.as(nativeEvent.getEventTarget()); + Element targetElement; + if (Element.is(targetNode)) { + targetElement = Element.as(targetNode); + } else { + targetElement = targetNode.getParentElement(); + } + if (Util.isTouchEvent(nativeEvent) || (dragElement != null && dragElement .isOrHasChild(targetElement))) { |