From: Anna Koskinen <anna@vaadin.com>
Date: Fri, 11 Jan 2013 12:55:51 +0000 (+0200)
Subject: Merge of (#10212) to Vaadin 7.
X-Git-Tag: 7.0.0.rc1~27
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bafdc1978580266cb2efe4425c9b02979f35cbd3;p=vaadin-framework.git

Merge of (#10212) to Vaadin 7.

Menu Items are not displayed when used in table row using Android 4.0.4.

Change-Id: Ied0f98eeae80cd9014b389d790e76908c3457be1
---

diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index f14c86aa36..021ab8fac1 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -5115,9 +5115,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                             dragTouchTimeout.cancel();
                         }
                         if (touchStart != null) {
-                            event.preventDefault();
-                            event.stopPropagation();
                             if (!BrowserInfo.get().isAndroid()) {
+                                event.preventDefault();
+                                event.stopPropagation();
                                 Util.simulateClickFromTouchEvent(touchStart,
                                         this);
                             }