From a76b1212b15e6c84360f5d24892a1120a06d7ebe Mon Sep 17 00:00:00 2001 From: Manolo Carrasco Date: Thu, 5 Feb 2015 17:56:01 +0100 Subject: Grid: mousewheel should be evaluated the first (#16591) Change-Id: I6d1380cf7a0eaf626cc8a4c65209887ab6bc4a90 --- client/src/com/vaadin/client/widgets/Escalator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3