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

Revert "Merge pull request #9565 from dbrnz/v6.0.0-beta.7-branch"

Browse Source 
This reverts commit 35569a8427, reversing
changes made to 29a434314b.
This commit is contained in:
Andreas Hocevar
2020-02-14 11:46:57 +01:00
parent 0e9b43ed93
commit ea5c91e19e
2 changed files with 122 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
test/spec/ol/interaction/mousewheelzoom.test.js
View File

@@ -3,7 +3,7 @@ import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js';
import View from '../../../../src/ol/View.js';
import Event from '../../../../src/ol/events/Event.js';
import {DEVICE_PIXEL_RATIO, FIREFOX} from '../../../../src/ol/has.js';
import MouseWheelZoom from '../../../../src/ol/interaction/MouseWheelZoom.js';
import MouseWheelZoom, {Mode} from '../../../../src/ol/interaction/MouseWheelZoom.js';
describe('ol.interaction.MouseWheelZoom', function() {
@@ -32,13 +32,13 @@ describe('ol.interaction.MouseWheelZoom', function() {
describe('timeout duration', function() {
let clock;
beforeEach(function() {
sinon.spy(interaction, 'endInteraction_');
sinon.spy(interaction, 'handleWheelZoom_');
clock = sinon.useFakeTimers();
});
afterEach(function() {
clock.restore();
interaction.endInteraction_.restore();
interaction.handleWheelZoom_.restore();
});
it('works with the default value', function(done) {
@@ -49,12 +49,12 @@ describe('ol.interaction.MouseWheelZoom', function() {
});
map.handleMapBrowserEvent(event);
clock.tick(100);
// default timeout is 400 ms, not called yet
expect(interaction.endInteraction_.called).to.be(false);
clock.tick(50);
// default timeout is 80 ms, not called yet
expect(interaction.handleWheelZoom_.called).to.be(false);
clock.tick(300);
expect(interaction.endInteraction_.called).to.be(true);
clock.tick(30);
expect(interaction.handleWheelZoom_.called).to.be(true);
done();
});
@@ -63,15 +63,10 @@ describe('ol.interaction.MouseWheelZoom', function() {
describe('handleEvent()', function() {
let view;
beforeEach(function() {
view = map.getView();
});
if (FIREFOX) {
it('works on Firefox in DOM_DELTA_PIXEL mode (trackpad)', function(done) {
map.once('postrender', function() {
expect(interaction.lastDelta_).to.be(1);
expect(interaction.mode_).to.be(Mode.TRACKPAD);
done();
});
const event = new MapBrowserEvent('wheel', map, {
@@ -89,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.lastDelta_).to.be(1);
expect(interaction.mode_).to.be(Mode.TRACKPAD);
done();
});
const event = new MapBrowserEvent('wheel', map, {
@@ -104,61 +99,56 @@ describe('ol.interaction.MouseWheelZoom', function() {
});
}
it('works in DOM_DELTA_LINE mode (wheel)', function(done) {
map.once('postrender', function() {
expect(view.getResolution()).to.be(2);
expect(view.getCenter()).to.eql([0, 0]);
done();
describe('spying on view.animateInternal()', function() {
let view;
beforeEach(function() {
view = map.getView();
sinon.spy(view, 'animateInternal');
});
const event = new MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaMode: WheelEvent.DOM_DELTA_LINE,
deltaY: 7.5,
target: map.getViewport(),
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
map.handleMapBrowserEvent(event);
});
it('works on all browsers (wheel)', function(done) {
map.once('postrender', function() {
expect(view.getResolution()).to.be(2);
expect(view.getCenter()).to.eql([0, 0]);
done();
afterEach(function() {
view.animateInternal.restore();
});
const event = new MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaY: 300, // trackpadDeltaPerZoom_
target: map.getViewport(),
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
it('works in DOM_DELTA_LINE mode (wheel)', function(done) {
map.once('postrender', function() {
const call = view.animateInternal.getCall(0);
expect(call.args[0].resolution).to.be(2);
expect(call.args[0].anchor).to.eql([0, 0]);
done();
});
map.handleMapBrowserEvent(event);
});
const event = new MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaMode: WheelEvent.DOM_DELTA_LINE,
deltaY: 3.714599609375,
target: map.getViewport(),
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
it('works in DOM_DELTA_LINE mode (wheel)', function(done) {
map.once('postrender', function() {
expect(view.getResolution()).to.be(2);
expect(view.getCenter()).to.eql([0, 0]);
done();
map.handleMapBrowserEvent(event);
});
const event = new MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaMode: WheelEvent.DOM_DELTA_LINE,
deltaY: 7.5, // trackpadDeltaPerZoom_ / 40
target: map.getViewport(),
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
it('works on all browsers (wheel)', function(done) {
map.once('postrender', function() {
const call = view.animateInternal.getCall(0);
expect(call.args[0].resolution).to.be(2);
expect(call.args[0].anchor).to.eql([0, 0]);
done();
});
const event = new MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaY: 120,
target: map.getViewport(),
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
map.handleMapBrowserEvent(event);
});
map.handleMapBrowserEvent(event);
});
});