diff options
| author | Anna Koskinen <anna@vaadin.com> | 2014-11-05 14:09:45 +0200 |
|---|---|---|
| committer | Anna Koskinen <anna@vaadin.com> | 2014-11-07 09:31:32 +0200 |
| commit | 0f5625d3ce241aa2de85ad6c5dd02d318759b021 (patch) | |
| tree | 4420abe6d64eeb8ee4c952fe236d30380ebfcaef /client/src | |
| parent | aacb2f8289bc2faaab1225bd8b0dacd873d7839a (diff) | |
| download | vaadin-framework-0f5625d3ce241aa2de85ad6c5dd02d318759b021.tar.gz vaadin-framework-0f5625d3ce241aa2de85ad6c5dd02d318759b021.zip | |
Column drag'n'drop disables HeaderClickEvents until left-click (#15167)
Change-Id: Ic64c0eb685c3dd9d7fdb10d9e19745ae2cc36be5
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VScrollTable.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java index 9c02d30a04..a382db573c 100644 --- a/client/src/com/vaadin/client/ui/VScrollTable.java +++ b/client/src/com/vaadin/client/ui/VScrollTable.java @@ -3138,6 +3138,15 @@ public class VScrollTable extends FlowPanel implements HasWidgets, && Util.isTouchEventOrLeftMouseButton(event)) { dragging = false; DOM.releaseCapture(getElement()); + + if (Util.isTouchEvent(event)) { + /* + * Prevent using in e.g. scrolling and prevent generated + * events. + */ + event.preventDefault(); + event.stopPropagation(); + } if (moved) { hideFloatingCopy(); tHead.removeSlotFocus(); @@ -3149,14 +3158,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, reOrderColumn(cid, closestSlot); } } - } - if (Util.isTouchEvent(event)) { - /* - * Prevent using in e.g. scrolling and prevent generated - * events. - */ - event.preventDefault(); - event.stopPropagation(); + moved = false; + break; } } |