]> source.dussan.org Git - vaadin-framework.git/commitdiff
Grid: mousewheel should be evaluated the first (#16591)
authorManolo Carrasco <manolo@vaadin.com>
Thu, 5 Feb 2015 16:56:01 +0000 (17:56 +0100)
committerManolo Carrasco <manolo@vaadin.com>
Thu, 5 Feb 2015 16:56:01 +0000 (17:56 +0100)
Change-Id: I6d1380cf7a0eaf626cc8a4c65209887ab6bc4a90

client/src/com/vaadin/client/widgets/Escalator.java

index 94b6efc0d7ffd0508f74f66f146161d993ee899d..07173c487b30fb8f65c84f32deaea15580333b8a 100644 (file)
@@ -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