summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManolo Carrasco <manolo@vaadin.com>2015-02-05 17:56:01 +0100
committerManolo Carrasco <manolo@vaadin.com>2015-02-05 17:56:01 +0100
commita76b1212b15e6c84360f5d24892a1120a06d7ebe (patch)
tree5756885cd73969bd7da64277c8e04ea8752d67ac
parenta15f2847950126bc87751c54d977d2f4edd45c04 (diff)
downloadvaadin-framework-a76b1212b15e6c84360f5d24892a1120a06d7ebe.tar.gz
vaadin-framework-a76b1212b15e6c84360f5d24892a1120a06d7ebe.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