Make code prettier

This updates ESLint and our shared eslint-config-openlayers to use Prettier.  Most formatting changes were automatically applied with this:

    npm run lint -- --fix

A few manual changes were required:

 * In `examples/offscreen-canvas.js`, the `//eslint-disable-line` comment needed to be moved to the appropriate line to disable the error about the `'worker-loader!./offscreen-canvas.worker.js'` import.
 * In `examples/webpack/exapmle-builder.js`, spaces could not be added after a couple `function`s for some reason.  While editing this, I reworked `ExampleBuilder` to be a class.
 * In `src/ol/format/WMSGetFeatureInfo.js`, the `// @ts-ignore` comment needed to be moved down one line so it applied to the `parsersNS` argument.
This commit is contained in:
Tim Schaub
2020-04-06 12:25:12 -06:00
parent 53b48baf62
commit 054af09032
790 changed files with 46833 additions and 33765 deletions
+41 -37
View File
@@ -1,10 +1,10 @@
import Event from '../../../../src/ol/events/Event.js';
import EventTarget from '../../../../src/ol/events/Target.js';
import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js';
import ZoomSlider from '../../../../src/ol/control/ZoomSlider.js';
import Event from '../../../../src/ol/events/Event.js';
import EventTarget from '../../../../src/ol/events/Target.js';
describe('ol.control.ZoomSlider', function() {
describe('ol.control.ZoomSlider', function () {
let map, target, zoomslider;
const createElement = document.createElement;
@@ -19,17 +19,17 @@ describe('ol.control.ZoomSlider', function() {
return element;
}
beforeEach(function() {
beforeEach(function () {
target = document.createElement('div');
document.body.appendChild(target);
zoomslider = new ZoomSlider();
map = new Map({
target: target,
controls: [zoomslider]
controls: [zoomslider],
});
});
afterEach(function() {
afterEach(function () {
zoomslider.dispose();
map.dispose();
document.body.removeChild(target);
@@ -38,8 +38,8 @@ describe('ol.control.ZoomSlider', function() {
target = null;
});
describe('DOM creation', function() {
it('creates the expected DOM elements', function() {
describe('DOM creation', function () {
it('creates the expected DOM elements', function () {
const zoomSliderContainers = target.querySelectorAll('.ol-zoomslider');
expect(zoomSliderContainers.length).to.be(1);
@@ -47,31 +47,36 @@ describe('ol.control.ZoomSlider', function() {
const zoomSliderContainer = zoomSliderContainers[0];
expect(zoomSliderContainer instanceof HTMLDivElement).to.be(true);
let hasUnselectableCls = zoomSliderContainer.classList.contains('ol-unselectable');
let hasUnselectableCls = zoomSliderContainer.classList.contains(
'ol-unselectable'
);
expect(hasUnselectableCls).to.be(true);
const zoomSliderThumbs = zoomSliderContainer.querySelectorAll('.ol-zoomslider-thumb');
const zoomSliderThumbs = zoomSliderContainer.querySelectorAll(
'.ol-zoomslider-thumb'
);
expect(zoomSliderThumbs.length).to.be(1);
const zoomSliderThumb = zoomSliderThumbs[0];
expect(zoomSliderThumb instanceof HTMLButtonElement).to.be(true);
hasUnselectableCls = zoomSliderThumb.classList.contains('ol-unselectable');
hasUnselectableCls = zoomSliderThumb.classList.contains(
'ol-unselectable'
);
expect(hasUnselectableCls).to.be(true);
});
});
describe('#initSlider_', function() {
it('sets limits', function() {
describe('#initSlider_', function () {
it('sets limits', function () {
zoomslider.initSlider_();
expect(zoomslider.widthLimit_).not.to.be(0);
expect(zoomslider.heightLimit_).to.be(0);
});
});
describe('#direction_', function() {
it('is horizontal for wide containers', function() {
describe('#direction_', function () {
it('is horizontal for wide containers', function () {
const control = new ZoomSlider({});
control.element.style.width = '1000px';
control.element.style.height = '10px';
@@ -84,7 +89,7 @@ describe('ol.control.ZoomSlider', function() {
control.dispose();
});
it('is vertical for tall containers', function() {
it('is vertical for tall containers', function () {
const control = new ZoomSlider({});
control.element.style.width = '10px';
control.element.style.height = '1000px';
@@ -98,23 +103,23 @@ describe('ol.control.ZoomSlider', function() {
});
});
describe('Pointer event handling', function() {
describe('Pointer event handling', function () {
let map;
beforeEach(function() {
beforeEach(function () {
map = new Map({
target: createMapDiv(500, 100),
view: new View({
center: [0, 0],
resolutions: [16, 8, 4, 2, 1, 0.5, 0.25, 0.125, 0.0625]
})
resolutions: [16, 8, 4, 2, 1, 0.5, 0.25, 0.125, 0.0625],
}),
});
});
afterEach(function() {
afterEach(function () {
disposeMap(map);
});
it('[horizontal] handles a drag sequence', function() {
it('[horizontal] handles a drag sequence', function () {
document.createElement = createEventElement;
const control = new ZoomSlider();
map.addControl(control);
@@ -126,8 +131,8 @@ describe('ol.control.ZoomSlider', function() {
control.element.firstChild.style.height = '10px';
map.renderSync();
const event = new Event();
event.type = 'pointerdown',
event.target = control.element.firstElementChild;
(event.type = 'pointerdown'),
(event.target = control.element.firstElementChild);
event.clientX = control.widthLimit_;
event.clientY = 0;
control.element.dispatchEvent(event);
@@ -135,12 +140,12 @@ describe('ol.control.ZoomSlider', function() {
expect(control.dragging_).to.be(true);
expect(control.dragListenerKeys_.length).to.be(2);
event.type = 'pointermove';
event.clientX = 6 * control.widthLimit_ / 8;
event.clientX = (6 * control.widthLimit_) / 8;
event.clientY = 0;
control.element.dispatchEvent(event);
expect(control.currentResolution_).to.be(4);
event.type = 'pointermove';
event.clientX = 4 * control.widthLimit_ / 8;
event.clientX = (4 * control.widthLimit_) / 8;
event.clientY = 0;
control.element.dispatchEvent(event);
event.type = 'pointerup';
@@ -149,7 +154,7 @@ describe('ol.control.ZoomSlider', function() {
expect(control.dragListenerKeys_.length).to.be(0);
expect(control.dragging_).to.be(false);
});
it('[horizontal] handles a drag sequence ending outside its bounds', function() {
it('[horizontal] handles a drag sequence ending outside its bounds', function () {
document.createElement = createEventElement;
const control = new ZoomSlider();
map.addControl(control);
@@ -170,12 +175,12 @@ describe('ol.control.ZoomSlider', function() {
expect(control.dragging_).to.be(true);
expect(control.dragListenerKeys_.length).to.be(2);
event.type = 'pointermove';
event.clientX = 6 * control.widthLimit_ / 8;
event.clientX = (6 * control.widthLimit_) / 8;
event.clientY = 0;
control.element.dispatchEvent(event);
expect(control.currentResolution_).to.be(4);
event.type = 'pointermove';
event.clientX = 12 * control.widthLimit_ / 8;
event.clientX = (12 * control.widthLimit_) / 8;
event.clientY = 0;
control.element.dispatchEvent(event);
event.type = 'pointerup';
@@ -185,7 +190,7 @@ describe('ol.control.ZoomSlider', function() {
expect(control.dragging_).to.be(false);
expect(control.currentResolution_).to.be(16);
});
it('[vertical] handles a drag sequence', function() {
it('[vertical] handles a drag sequence', function () {
document.createElement = createEventElement;
const control = new ZoomSlider();
control.element.style.width = '10px';
@@ -207,12 +212,12 @@ describe('ol.control.ZoomSlider', function() {
expect(control.dragListenerKeys_.length).to.be(2);
event.type = 'pointermove';
event.clientX = 0;
event.clientY = 2 * control.heightLimit_ / 8;
event.clientY = (2 * control.heightLimit_) / 8;
control.element.dispatchEvent(event);
expect(control.currentResolution_).to.be(0.25);
event.type = 'pointermove';
event.clientX = 0;
event.clientY = 4 * control.heightLimit_ / 8;
event.clientY = (4 * control.heightLimit_) / 8;
control.element.dispatchEvent(event);
event.type = 'pointerup';
control.element.dispatchEvent(event);
@@ -220,7 +225,7 @@ describe('ol.control.ZoomSlider', function() {
expect(control.dragListenerKeys_.length).to.be(0);
expect(control.dragging_).to.be(false);
});
it('[vertical] handles a drag sequence ending outside its bounds', function() {
it('[vertical] handles a drag sequence ending outside its bounds', function () {
document.createElement = createEventElement;
const control = new ZoomSlider();
control.element.style.width = '10px';
@@ -242,12 +247,12 @@ describe('ol.control.ZoomSlider', function() {
expect(control.dragListenerKeys_.length).to.be(2);
event.type = 'pointermove';
event.clientX = 0;
event.clientY = 2 * control.heightLimit_ / 8;
event.clientY = (2 * control.heightLimit_) / 8;
control.element.dispatchEvent(event);
expect(control.currentResolution_).to.be(0.25);
event.type = 'pointermove';
event.clientX = 0;
event.clientY = 12 * control.heightLimit_ / 8;
event.clientY = (12 * control.heightLimit_) / 8;
control.element.dispatchEvent(event);
event.type = 'pointerup';
control.element.dispatchEvent(event);
@@ -256,5 +261,4 @@ describe('ol.control.ZoomSlider', function() {
expect(control.dragging_).to.be(false);
});
});
});