diff options
| author | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-04-13 08:17:48 +0000 |
|---|---|---|
| committer | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-04-13 08:17:48 +0000 |
| commit | 1e07642a6f7931855ccfc54560369a10ce4ff0df (patch) | |
| tree | a4d09298d359fe4e4466ddf3f84c032b94d752c5 /src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | |
| parent | 97cc8e525a3c691093168fba7129e91b62e3b7b6 (diff) | |
| download | vaadin-framework-1e07642a6f7931855ccfc54560369a10ce4ff0df.tar.gz vaadin-framework-1e07642a6f7931855ccfc54560369a10ce4ff0df.zip | |
Blocked merge of revisions related to 6.7.7 release
svn changeset:23522/svn branch:6.8
Diffstat (limited to 'src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 43908d474a..8203f909aa 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -485,12 +485,14 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, } scrollBodyPanel.addKeyUpHandler(navKeyUpHandler); - scrollBodyPanel.sinkEvents(Event.TOUCHEVENTS); - scrollBodyPanel.addDomHandler(new TouchStartHandler() { - public void onTouchStart(TouchStartEvent event) { - getTouchScrollDelegate().onTouchStart(event); - } - }, TouchStartEvent.getType()); + if (BrowserInfo.get().requiresTouchScrollDelegate()) { + scrollBodyPanel.sinkEvents(Event.TOUCHEVENTS); + scrollBodyPanel.addDomHandler(new TouchStartHandler() { + public void onTouchStart(TouchStartEvent event) { + getTouchScrollDelegate().onTouchStart(event); + } + }, TouchStartEvent.getType()); + } scrollBodyPanel.sinkEvents(Event.ONCONTEXTMENU); scrollBodyPanel.addDomHandler(new ContextMenuHandler() { |