ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure changes to zoom wheel handling pass tests.

Browse Source
This commit is contained in:
David Brooks
2019-05-28 09:53:36 +12:00
committed by Andreas Hocevar
parent 54bae0168f
commit 77658e5750
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/MouseWheelZoom.js
+1 -2
View File
@@ -4,8 +4,7 @@
import {always, focus} from '../events/condition.js'; import {always, focus} from '../events/condition.js';
import EventType from '../events/EventType.js'; import EventType from '../events/EventType.js';
import {DEVICE_PIXEL_RATIO, FIREFOX} from '../has.js'; import {DEVICE_PIXEL_RATIO, FIREFOX} from '../has.js';
import Interaction, {zoomByDelta} from './Interaction.js'; import Interaction from './Interaction.js';
import {clamp} from '../math.js';
/** /**
test/spec/ol/interaction/mousewheelzoom.test.js
+4 -4
View File
@@ -2,8 +2,8 @@ import Map from '../../../../src/ol/Map.js';
import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js'; import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js';
import View from '../../../../src/ol/View.js'; import View from '../../../../src/ol/View.js';
import Event from '../../../../src/ol/events/Event.js'; import Event from '../../../../src/ol/events/Event.js';
import {DEVICE_PIXEL_RATIO, FIREFOX} from '../../../../src/ol/has.js'; import {DEVICE_PIXEL_RATIO, FIREFOX, SAFARI} from '../../../../src/ol/has.js';
import MouseWheelZoom, {Mode} from '../../../../src/ol/interaction/MouseWheelZoom.js'; import MouseWheelZoom from '../../../../src/ol/interaction/MouseWheelZoom.js';
describe('ol.interaction.MouseWheelZoom', function() { describe('ol.interaction.MouseWheelZoom', function() {
@@ -66,7 +66,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
if (FIREFOX) { if (FIREFOX) {
it('works on Firefox in DOM_DELTA_PIXEL mode (trackpad)', function(done) { it('works on Firefox in DOM_DELTA_PIXEL mode (trackpad)', function(done) {
map.once('postrender', function() { map.once('postrender', function() {
expect(interaction.mode_).to.be(Mode.TRACKPAD); expect(interaction.lastDelta_).to.be(1);
done(); done();
}); });
const event = new MapBrowserEvent('wheel', map, { const event = new MapBrowserEvent('wheel', map, {
@@ -84,7 +84,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
if (!FIREFOX) { if (!FIREFOX) {
it('works in DOM_DELTA_PIXEL mode (trackpad)', function(done) { it('works in DOM_DELTA_PIXEL mode (trackpad)', function(done) {
map.once('postrender', function() { map.once('postrender', function() {
expect(interaction.mode_).to.be(Mode.TRACKPAD); expect(interaction.lastDelta_).to.be(1);
done(); done();
}); });
const event = new MapBrowserEvent('wheel', map, { const event = new MapBrowserEvent('wheel', map, {