aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2014-12-08 11:24:51 +0200
committerVaadin Code Review <review@vaadin.com>2014-12-08 14:29:34 +0000
commit71fc0accc54d16b9445d81e1c71a98b9c332b332 (patch)
tree98c0104f14612c031d026fcf07473725a969dd4a
parent0a9d29b219ef0848dc8898af6c5a206aa69f2165 (diff)
downloadvaadin-framework-71fc0accc54d16b9445d81e1c71a98b9c332b332.tar.gz
vaadin-framework-71fc0accc54d16b9445d81e1c71a98b9c332b332.zip
Prevent drag select when right clicking (#13334)
Change-Id: If2e865fa70d759cb84c18e92c81f3e36c091d275
-rw-r--r--client/src/com/vaadin/client/ui/grid/selection/MultiSelectionRenderer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/grid/selection/MultiSelectionRenderer.java b/client/src/com/vaadin/client/ui/grid/selection/MultiSelectionRenderer.java
index 87380f0e2a..01be4ea43f 100644
--- a/client/src/com/vaadin/client/ui/grid/selection/MultiSelectionRenderer.java
+++ b/client/src/com/vaadin/client/ui/grid/selection/MultiSelectionRenderer.java
@@ -648,7 +648,8 @@ public class MultiSelectionRenderer<T> extends ComplexRenderer<Boolean> {
@Override
public boolean onBrowserEvent(final Cell cell, final NativeEvent event) {
if (BrowserEvents.TOUCHSTART.equals(event.getType())
- || BrowserEvents.MOUSEDOWN.equals(event.getType())) {
+ || (BrowserEvents.MOUSEDOWN.equals(event.getType()) && event
+ .getButton() == NativeEvent.BUTTON_LEFT)) {
injectNativeHandler();
int logicalRowIndex = getLogicalRowIndex(Element.as(event
.getEventTarget()));