summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Koskinen <anna@vaadin.com>2013-01-11 14:55:51 +0200
committerVaadin Code Review <review@vaadin.com>2013-01-11 16:57:18 +0000
commitbafdc1978580266cb2efe4425c9b02979f35cbd3 (patch)
tree0f0b78b0c0c3cb4bbcd5629ed71cbcefd1a8b0b2
parent2747e58fbfd76e0996c40e4f8c314578029c1623 (diff)
downloadvaadin-framework-bafdc1978580266cb2efe4425c9b02979f35cbd3.tar.gz
vaadin-framework-bafdc1978580266cb2efe4425c9b02979f35cbd3.zip
Merge of (#10212) to Vaadin 7.
Menu Items are not displayed when used in table row using Android 4.0.4. Change-Id: Ied0f98eeae80cd9014b389d790e76908c3457be1
-rw-r--r--client/src/com/vaadin/client/ui/VScrollTable.java4
1 files changed, 2 insertions, 2 deletions
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);
}