summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManolo Carrasco <manolo@vaadin.com>2015-02-05 17:56:01 +0100
committerLeif Åstrand <leif@vaadin.com>2015-02-06 09:50:45 +0200
commit2b832f8fc362cf184801ad430ff8aa07e91c4acd (patch)
treefa004f2dc8d19f44bc562e0c669c1b9bb762bf01
parentf52d76cbb88e9674ce6c712479222852c4a9dc6c (diff)
downloadvaadin-framework-2b832f8fc362cf184801ad430ff8aa07e91c4acd.tar.gz
vaadin-framework-2b832f8fc362cf184801ad430ff8aa07e91c4acd.zip
Grid: mousewheel should be evaluated the first (#16591)
Change-Id: I6d1380cf7a0eaf626cc8a4c65209887ab6bc4a90
-rw-r--r--client/src/com/vaadin/client/widgets/Escalator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/widgets/Escalator.java b/client/src/com/vaadin/client/widgets/Escalator.java
index 94b6efc0d7..07173c487b 100644
--- a/client/src/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/com/vaadin/client/widgets/Escalator.java
@@ -1003,7 +1003,7 @@ public class Escalator extends Widget implements RequiresResize, DeferredWorker
/*-{
if (element.addEventListener) {
// firefox likes "wheel", while others use "mousewheel"
- var eventName = element.onwheel===undefined?"mousewheel":"wheel";
+ var eventName = 'onmousewheel' in element ? 'mousewheel' : 'wheel';
element.addEventListener(eventName, this.@com.vaadin.client.widgets.JsniWorkaround::mousewheelListenerFunction);
} else {
// IE8