diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-02-19 12:04:42 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-02-19 12:04:42 +0200 |
| commit | 1faaa184dc8fbcd551049c78e420a7cfff0ede0e (patch) | |
| tree | 99a5424cab7b56e0e3d13dbde664c83ae53a4329 /src/com/vaadin/terminal/gwt/client/Util.java | |
| parent | bc8914066b68e1938ac63606f205672d688be0f1 (diff) | |
| parent | e7792742a7bc1e13ceeffb9561f32d9bc01338b2 (diff) | |
| download | vaadin-framework-1faaa184dc8fbcd551049c78e420a7cfff0ede0e.tar.gz vaadin-framework-1faaa184dc8fbcd551049c78e420a7cfff0ede0e.zip | |
Merge branch 'master' into rpc
Conflicts:
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
Diffstat (limited to 'src/com/vaadin/terminal/gwt/client/Util.java')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/Util.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java index 591016d54d..0c4181066a 100644 --- a/src/com/vaadin/terminal/gwt/client/Util.java +++ b/src/com/vaadin/terminal/gwt/client/Util.java @@ -1238,7 +1238,6 @@ public class Util { * button, false otherwise */ public static boolean isTouchEventOrLeftMouseButton(Event event) { - int eventType = event.getTypeInt(); boolean touchEvent = Util.isTouchEvent(event); return touchEvent || event.getButton() == Event.BUTTON_LEFT; } |