Fix mouse wheel scroll listenings (#1153)

* change mousewheel to wheel and set passive to false

* use deltaY instead of wheelDelta

Author: fuzhenn

src/core/util/dom.js

@@ -171,11 +171,13 @@ export function addDomEvent(obj, typeArr, handler, context) {
             callback: eventHandler,
             src: handler
         });
-        //firefox
-        if (type === 'mousewheel' && Browser.gecko) {
-            type = 'DOMMouseScroll';
+        // https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
+        if (Browser.ie) {
+            // ie doesn't support options as the third parameter
+            obj.addEventListener(type, eventHandler, false);
+        } else {
+            obj.addEventListener(type, eventHandler, { capture: false, passive: false });
         }
-        obj.addEventListener(type, eventHandler, false);
     }
     return this;
 }

src/map/handler/Map.ScrollWheelZoom.js

@@ -26,11 +26,11 @@ class MapScrollWheelZoomHandler extends Handler {
     }
 
     addHooks() {
-        addDomEvent(this.target._containerDOM, 'mousewheel', this._onWheelScroll, this);
+        addDomEvent(this.target._containerDOM, 'wheel', this._onWheelScroll, this);
     }
 
     removeHooks() {
-        removeDomEvent(this.target._containerDOM, 'mousewheel', this._onWheelScroll);
+        removeDomEvent(this.target._containerDOM, 'wheel', this._onWheelScroll);
     }
 
     _onWheelScroll(evt) {
@@ -128,7 +128,7 @@ class MapScrollWheelZoomHandler extends Handler {
             return false;
         }
         this._requesting = 0;
-        let levelValue = (evt.wheelDelta ? evt.wheelDelta : evt.detail) > 0 ? 1 : -1;
+        let levelValue = (evt.deltaY ? evt.deltaY * -1 : evt.wheelDelta ? evt.wheelDelta : evt.detail) > 0 ? 1 : -1;
         if (evt.detail) {
             levelValue *= -1;
         }

test/map/MapAnimSpec.js

@@ -144,7 +144,7 @@ describe('Map.Anim', function () {
         });
         setTimeout(function () {
             happen.once(container, {
-                type: (maptalks.Browser.gecko ? 'DOMMouseScroll' : 'mousewheel'),
+                type: 'wheel',
                 detail: 100
             });
         }, 100);

test/map/MapScrollZoomSpec.js

@@ -7,7 +7,7 @@ describe('Map.ScrollZoom', function () {
     var delay;
     function scrollMap(delta) {
         happen.once(container, {
-            type: (maptalks.Browser.gecko ? 'DOMMouseScroll' : 'mousewheel'),
+            type: 'wheel',
             detail: delta
         });
     }