Use blocked scoped variables

In addition to using const and let, this also upgrades our linter config and removes lint (mostly whitespace).

test/spec/ol/pointer/mousesource.test.js

@@ -6,10 +6,10 @@ import _ol_pointer_TouchSource_ from '../../../../src/ol/pointer/TouchSource.js'
 
 
 describe('ol.pointer.MouseSource', function() {
-  var handler;
-  var target;
-  var eventSpy;
-  var clock;
+  let handler;
+  let target;
+  let eventSpy;
+  let clock;
 
   beforeEach(function() {
     clock = sinon.useFakeTimers();
@@ -68,14 +68,14 @@ describe('ol.pointer.MouseSource', function() {
   });
 
   function simulateTouchEvent(type, x, y) {
-    var touches = [{
+    const touches = [{
       identifier: 4,
       clientX: x,
       clientY: y,
       target: target
     }];
 
-    var event = {
+    const event = {
       type: type,
       touches: touches,
       changedTouches: touches
@@ -84,7 +84,7 @@ describe('ol.pointer.MouseSource', function() {
   }
 
   function simulateEvent(type, x, y) {
-    var event = {
+    const event = {
       type: type,
       clientX: x,
       clientY: y,

test/spec/ol/pointer/pointereventhandler.test.js

@@ -7,9 +7,9 @@ import PointerEventHandler from '../../../../src/ol/pointer/PointerEventHandler.
 
 
 describe('ol.pointer.PointerEventHandler', function() {
-  var handler;
-  var target;
-  var eventSpy;
+  let handler;
+  let target;
+  let eventSpy;
 
   beforeEach(function() {
     target = new EventTarget();
@@ -35,7 +35,7 @@ describe('ol.pointer.PointerEventHandler', function() {
   });
 
   function simulateEvent(type, x, y) {
-    var event = {
+    const event = {
       type: type,
       clientX: x,
       clientY: y,
@@ -50,7 +50,7 @@ describe('ol.pointer.PointerEventHandler', function() {
       simulateEvent('mousedown', 0, 0);
       expect(eventSpy.calledOnce).to.be.ok();
 
-      var pointerEvent = eventSpy.firstCall.args[0];
+      const pointerEvent = eventSpy.firstCall.args[0];
       expect(pointerEvent).to.be.a(PointerEvent);
       expect(pointerEvent.type).to.be('pointerdown');
       expect(pointerEvent.pointerId).to.be(1);
@@ -77,8 +77,8 @@ describe('ol.pointer.PointerEventHandler', function() {
 
   describe('pointer enter and over', function() {
     it('fires pointerenter and pointerover events', function() {
-      var enterEventSpy = sinon.spy();
-      var overEventSpy = sinon.spy();
+      const enterEventSpy = sinon.spy();
+      const overEventSpy = sinon.spy();
 
       _ol_events_.listen(handler, 'pointerenter', enterEventSpy);
       _ol_events_.listen(handler, 'pointerover', overEventSpy);
@@ -92,8 +92,8 @@ describe('ol.pointer.PointerEventHandler', function() {
 
   describe('pointer leave and out', function() {
     it('fires pointerleave and pointerout events', function() {
-      var leaveEventSpy = sinon.spy();
-      var outEventSpy = sinon.spy();
+      const leaveEventSpy = sinon.spy();
+      const outEventSpy = sinon.spy();
 
       _ol_events_.listen(handler, 'pointerleave', leaveEventSpy);
       _ol_events_.listen(handler, 'pointerout', outEventSpy);
@@ -107,15 +107,15 @@ describe('ol.pointer.PointerEventHandler', function() {
 
   describe('#cloneEvent', function() {
     it('copies the properties of an event', function() {
-      var event = {
+      const event = {
         type: 'mousedown',
         target: target,
         clientX: 1,
         clientY: 2
       };
-      var browserEvent = event;
+      const browserEvent = event;
 
-      var eventClone = handler.cloneEvent(browserEvent, event);
+      const eventClone = handler.cloneEvent(browserEvent, event);
 
       // properties are copied from `event`
       expect(eventClone.type).to.be('mousedown');
@@ -136,17 +136,17 @@ describe('ol.pointer.PointerEventHandler', function() {
 
   describe('#makeEvent', function() {
     it('makes a new pointer event', function() {
-      var event = {
+      const event = {
         type: 'mousedown',
         target: target,
         clientX: 1,
         clientY: 2
       };
-      var browserEvent = event;
+      const browserEvent = event;
 
-      var eventClone = handler.cloneEvent(browserEvent, event);
-      var pointerEvent = handler.makeEvent('pointerdown',
-          eventClone, browserEvent);
+      const eventClone = handler.cloneEvent(browserEvent, event);
+      const pointerEvent = handler.makeEvent('pointerdown',
+        eventClone, browserEvent);
 
       expect(pointerEvent.type).to.be('pointerdown');
       expect(pointerEvent.clientX).to.be(1);

test/spec/ol/pointer/touchsource.test.js

@@ -5,9 +5,9 @@ import _ol_has_ from '../../../../src/ol/has.js';
 import _ol_obj_ from '../../../../src/ol/obj.js';
 import PointerEventHandler from '../../../../src/ol/pointer/PointerEventHandler.js';
 describe('ol.pointer.TouchSource', function() {
-  var handler;
-  var target;
-  var eventSpy;
+  let handler;
+  let target;
+  let eventSpy;
 
   beforeEach(function() {
     target = new EventTarget();
@@ -37,14 +37,14 @@ describe('ol.pointer.TouchSource', function() {
       expect(eventSpy.calledTwice).to.be.ok();
 
       // pointer event for the first touch contact
-      var pointerEvent1 = eventSpy.firstCall.args[0];
+      const pointerEvent1 = eventSpy.firstCall.args[0];
       expect(pointerEvent1.pointerId).to.be(5);
       expect(pointerEvent1.pointerType).to.be('touch');
       expect(pointerEvent1.clientX).to.be(10);
       expect(pointerEvent1.clientY).to.be(11);
 
       // pointer event for the second touch contact
-      var pointerEvent2 = eventSpy.secondCall.args[0];
+      const pointerEvent2 = eventSpy.secondCall.args[0];
       expect(pointerEvent2.pointerId).to.be(6);
       expect(pointerEvent2.pointerType).to.be('touch');
       expect(pointerEvent2.clientX).to.be(30);
@@ -72,7 +72,7 @@ describe('ol.pointer.TouchSource', function() {
       expect(Object.keys(handler.pointerMap).length).to.be(2);
 
       // first touch moves
-      var moveEventSpy = sinon.spy();
+      const moveEventSpy = sinon.spy();
       _ol_events_.listen(handler, 'pointermove', moveEventSpy);
 
       simulateTouchEvent('touchmove', [
@@ -82,7 +82,7 @@ describe('ol.pointer.TouchSource', function() {
       expect(moveEventSpy.calledOnce).to.be.ok();
 
       // and then both touches go up
-      var upEventSpy = sinon.spy();
+      const upEventSpy = sinon.spy();
       _ol_events_.listen(handler, 'pointerup', upEventSpy);
 
       simulateTouchEvent('touchend', [
@@ -105,7 +105,7 @@ describe('ol.pointer.TouchSource', function() {
       expect(Object.keys(handler.pointerMap).length).to.be(1);
 
       // second touch, but the first touch has disappeared
-      var cancelEventSpy = sinon.spy();
+      const cancelEventSpy = sinon.spy();
       _ol_events_.listen(handler, 'pointercancel', cancelEventSpy);
       simulateTouchEvent('touchstart', [
         {identifier: 4, clientX: 30, clientY: 45}
@@ -122,7 +122,7 @@ describe('ol.pointer.TouchSource', function() {
   function simulateTouchEvent(type, changedTouches, touches) {
     touches = touches !== undefined ? touches : changedTouches;
 
-    var event = new Event(type);
+    const event = new Event(type);
     _ol_obj_.assign(event, {
       touches: touches,
       changedTouches: changedTouches