Named exports from ol/events/Event

src/ol/PluggableMap.js

@@ -18,7 +18,7 @@ import ViewHint from './ViewHint.js';
 import {assert} from './asserts.js';
 import {removeNode} from './dom.js';
 import {listen, unlistenByKey, unlisten} from './events.js';
-import Event from './events/Event.js';
+import {stopPropagation} from './events/Event.js';
 import EventType from './events/EventType.js';
 import {createEmpty, clone, createOrUpdateEmpty, equals, getForViewAndSize, isEmpty} from './extent.js';
 import {TRUE} from './functions.js';
@@ -248,8 +248,7 @@ const PluggableMap = function(options) {
     EventType.WHEEL
   ];
   for (let i = 0, ii = overlayEvents.length; i < ii; ++i) {
-    listen(this.overlayContainerStopEvent_, overlayEvents[i],
+    listen(this.overlayContainerStopEvent_, overlayEvents[i], stopPropagation);
-      Event.stopPropagation);
   }
   this.viewport_.appendChild(this.overlayContainerStopEvent_);
 

src/ol/control/ZoomSlider.js

@@ -7,7 +7,7 @@ import Control from '../control/Control.js';
 import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
 import {easeOut} from '../easing.js';
 import {listen} from '../events.js';
-import Event from '../events/Event.js';
+import {stopPropagation} from '../events/Event.js';
 import EventType from '../events/EventType.js';
 import {clamp} from '../math.js';
 import PointerEventType from '../pointer/EventType.js';
@@ -130,10 +130,8 @@ const ZoomSlider = function(opt_options) {
   listen(this.dragger_, PointerEventType.POINTERUP,
     this.handleDraggerEnd_, this);
 
-  listen(containerElement, EventType.CLICK,
+  listen(containerElement, EventType.CLICK, this.handleContainerClick_, this);
-    this.handleContainerClick_, this);
+  listen(thumbElement, EventType.CLICK, stopPropagation);
-  listen(thumbElement, EventType.CLICK,
-    Event.stopPropagation);
 
   Control.call(this, {
     element: containerElement,

src/ol/events/Event.js

@@ -61,15 +61,16 @@ Event.prototype.preventDefault =
 /**
  * @param {Event|ol.events.Event} evt Event
  */
-Event.stopPropagation = function(evt) {
+export function stopPropagation(evt) {
   evt.stopPropagation();
-};
+}
 
 
 /**
  * @param {Event|ol.events.Event} evt Event
  */
-Event.preventDefault = function(evt) {
+export function preventDefault(evt) {
   evt.preventDefault();
-};
+}
+
 export default Event;

test/spec/ol/events/event.test.js

@@ -1,4 +1,4 @@
-import Event from '../../../../src/ol/events/Event.js';
+import Event, {preventDefault, stopPropagation} from '../../../../src/ol/events/Event.js';
 
 describe('ol.events.Event', function() {
 
@@ -30,7 +30,7 @@ describe('ol.events.Event', function() {
       const event = {
         preventDefault: sinon.spy()
       };
-      Event.preventDefault(event);
+      preventDefault(event);
       expect(event.preventDefault.called).to.be(true);
     });
   });
@@ -40,7 +40,7 @@ describe('ol.events.Event', function() {
       const event = {
         stopPropagation: sinon.spy()
       };
-      Event.stopPropagation(event);
+      stopPropagation(event);
       expect(event.stopPropagation.called).to.be(true);
     });
   });