diff --git a/src/ol/interaction/MouseWheelZoom.js b/src/ol/interaction/MouseWheelZoom.js index 6fcc526230..81c638dca9 100644 --- a/src/ol/interaction/MouseWheelZoom.js +++ b/src/ol/interaction/MouseWheelZoom.js @@ -8,12 +8,8 @@ import {all, always, focusWithTabindex} from '../events/condition.js'; import {clamp} from '../math.js'; /** - * @enum {string} + * @typedef {'trackpad' | 'wheel'} Mode */ -export const Mode = { - TRACKPAD: 'trackpad', - WHEEL: 'wheel', -}; /** * @typedef {Object} Options @@ -218,12 +214,12 @@ class MouseWheelZoom extends Interaction { } if (!this.mode_ || now - this.startTime_ > this.trackpadEventGap_) { - this.mode_ = Math.abs(delta) < 4 ? Mode.TRACKPAD : Mode.WHEEL; + this.mode_ = Math.abs(delta) < 4 ? 'trackpad' : 'wheel'; } const view = map.getView(); if ( - this.mode_ === Mode.TRACKPAD && + this.mode_ === 'trackpad' && !(view.getConstrainResolution() || this.constrainResolution_) ) { if (this.trackpadTimeoutId_) { diff --git a/test/browser/spec/ol/interaction/mousewheelzoom.test.js b/test/browser/spec/ol/interaction/mousewheelzoom.test.js index 0640478fea..225d4ebd5c 100644 --- a/test/browser/spec/ol/interaction/mousewheelzoom.test.js +++ b/test/browser/spec/ol/interaction/mousewheelzoom.test.js @@ -1,14 +1,15 @@ import Event from '../../../../../src/ol/events/Event.js'; import Map from '../../../../../src/ol/Map.js'; import MapBrowserEvent from '../../../../../src/ol/MapBrowserEvent.js'; -import MouseWheelZoom, { - Mode, -} from '../../../../../src/ol/interaction/MouseWheelZoom.js'; +import MouseWheelZoom from '../../../../../src/ol/interaction/MouseWheelZoom.js'; import View from '../../../../../src/ol/View.js'; import {DEVICE_PIXEL_RATIO, FIREFOX} from '../../../../../src/ol/has.js'; describe('ol.interaction.MouseWheelZoom', function () { - let map, interaction; + /** @type {Map} */ + let map; + /** @type {MouseWheelZoom} */ + let interaction; beforeEach(function () { interaction = new MouseWheelZoom(); @@ -65,7 +66,7 @@ describe('ol.interaction.MouseWheelZoom', function () { if (FIREFOX) { it('works on Firefox in DOM_DELTA_PIXEL mode (trackpad)', function (done) { map.once('postrender', function () { - expect(interaction.mode_).to.be(Mode.TRACKPAD); + expect(interaction.mode_).to.be('trackpad'); done(); }); const event = new MapBrowserEvent('wheel', map, { @@ -83,7 +84,7 @@ describe('ol.interaction.MouseWheelZoom', function () { if (!FIREFOX) { it('works in DOM_DELTA_PIXEL mode (trackpad)', function (done) { map.once('postrender', function () { - expect(interaction.mode_).to.be(Mode.TRACKPAD); + expect(interaction.mode_).to.be('trackpad'); done(); }); const event = new MapBrowserEvent('wheel', map, {