Rename _ol_events_EventTarget_ to EventTarget

src/ol/ImageBase.js

@@ -2,7 +2,7 @@
  * @module ol/ImageBase
  */
 import {inherits} from './index.js';
-import _ol_events_EventTarget_ from './events/EventTarget.js';
+import EventTarget from './events/EventTarget.js';
 import EventType from './events/EventType.js';
 
 /**
@@ -16,7 +16,7 @@ import EventType from './events/EventType.js';
  */
 var _ol_ImageBase_ = function(extent, resolution, pixelRatio, state) {
 
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * @protected
@@ -44,7 +44,7 @@ var _ol_ImageBase_ = function(extent, resolution, pixelRatio, state) {
 
 };
 
-inherits(_ol_ImageBase_, _ol_events_EventTarget_);
+inherits(_ol_ImageBase_, EventTarget);
 
 
 /**

src/ol/MapBrowserEventHandler.js

@@ -6,7 +6,7 @@ import _ol_has_ from './has.js';
 import MapBrowserEventType from './MapBrowserEventType.js';
 import MapBrowserPointerEvent from './MapBrowserPointerEvent.js';
 import _ol_events_ from './events.js';
-import _ol_events_EventTarget_ from './events/EventTarget.js';
+import EventTarget from './events/EventTarget.js';
 import _ol_pointer_EventType_ from './pointer/EventType.js';
 import _ol_pointer_PointerEventHandler_ from './pointer/PointerEventHandler.js';
 
@@ -18,7 +18,7 @@ import _ol_pointer_PointerEventHandler_ from './pointer/PointerEventHandler.js';
  */
 var MapBrowserEventHandler = function(map, moveTolerance) {
 
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * This is the element that we will listen to the real events on.
@@ -110,7 +110,7 @@ var MapBrowserEventHandler = function(map, moveTolerance) {
 
 };
 
-inherits(MapBrowserEventHandler, _ol_events_EventTarget_);
+inherits(MapBrowserEventHandler, EventTarget);
 
 
 /**
@@ -320,6 +320,6 @@ MapBrowserEventHandler.prototype.disposeInternal = function() {
     this.pointerEventHandler_.dispose();
     this.pointerEventHandler_ = null;
   }
-  _ol_events_EventTarget_.prototype.disposeInternal.call(this);
+  EventTarget.prototype.disposeInternal.call(this);
 };
 export default MapBrowserEventHandler;

src/ol/Observable.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from './index.js';
 import _ol_events_ from './events.js';
-import _ol_events_EventTarget_ from './events/EventTarget.js';
+import EventTarget from './events/EventTarget.js';
 import EventType from './events/EventType.js';
 
 /**
@@ -22,7 +22,7 @@ import EventType from './events/EventType.js';
  */
 var _ol_Observable_ = function() {
 
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * @private
@@ -32,7 +32,7 @@ var _ol_Observable_ = function() {
 
 };
 
-inherits(_ol_Observable_, _ol_events_EventTarget_);
+inherits(_ol_Observable_, EventTarget);
 
 
 /**

src/ol/Tile.js

@@ -4,7 +4,7 @@
 import {inherits} from './index.js';
 import _ol_TileState_ from './TileState.js';
 import {easeIn} from './easing.js';
-import _ol_events_EventTarget_ from './events/EventTarget.js';
+import EventTarget from './events/EventTarget.js';
 import EventType from './events/EventType.js';
 
 /**
@@ -19,7 +19,7 @@ import EventType from './events/EventType.js';
  * @param {olx.TileOptions=} opt_options Tile options.
  */
 var _ol_Tile_ = function(tileCoord, state, opt_options) {
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   var options = opt_options ? opt_options : {};
 
@@ -66,7 +66,7 @@ var _ol_Tile_ = function(tileCoord, state, opt_options) {
 
 };
 
-inherits(_ol_Tile_, _ol_events_EventTarget_);
+inherits(_ol_Tile_, EventTarget);
 
 
 /**

src/ol/events/EventTarget.js

@@ -24,7 +24,7 @@ import Event from '../events/Event.js';
  * @constructor
  * @extends {ol.Disposable}
  */
-var _ol_events_EventTarget_ = function() {
+var EventTarget = function() {
 
   _ol_Disposable_.call(this);
 
@@ -48,14 +48,14 @@ var _ol_events_EventTarget_ = function() {
 
 };
 
-inherits(_ol_events_EventTarget_, _ol_Disposable_);
+inherits(EventTarget, _ol_Disposable_);
 
 
 /**
  * @param {string} type Type.
  * @param {ol.EventsListenerFunctionType} listener Listener.
  */
-_ol_events_EventTarget_.prototype.addEventListener = function(type, listener) {
+EventTarget.prototype.addEventListener = function(type, listener) {
   var listeners = this.listeners_[type];
   if (!listeners) {
     listeners = this.listeners_[type] = [];
@@ -73,7 +73,7 @@ _ol_events_EventTarget_.prototype.addEventListener = function(type, listener) {
  * @return {boolean|undefined} `false` if anyone called preventDefault on the
  *     event object or if any of the listeners returned false.
  */
-_ol_events_EventTarget_.prototype.dispatchEvent = function(event) {
+EventTarget.prototype.dispatchEvent = function(event) {
   var evt = typeof event === 'string' ? new Event(event) : event;
   var type = evt.type;
   evt.target = this;
@@ -108,7 +108,7 @@ _ol_events_EventTarget_.prototype.dispatchEvent = function(event) {
 /**
  * @inheritDoc
  */
-_ol_events_EventTarget_.prototype.disposeInternal = function() {
+EventTarget.prototype.disposeInternal = function() {
   _ol_events_.unlistenAll(this);
 };
 
@@ -120,7 +120,7 @@ _ol_events_EventTarget_.prototype.disposeInternal = function() {
  * @param {string} type Type.
  * @return {Array.<ol.EventsListenerFunctionType>} Listeners.
  */
-_ol_events_EventTarget_.prototype.getListeners = function(type) {
+EventTarget.prototype.getListeners = function(type) {
   return this.listeners_[type];
 };
 
@@ -130,7 +130,7 @@ _ol_events_EventTarget_.prototype.getListeners = function(type) {
  *     `true` will be returned if this EventTarget has any listeners.
  * @return {boolean} Has listeners.
  */
-_ol_events_EventTarget_.prototype.hasListener = function(opt_type) {
+EventTarget.prototype.hasListener = function(opt_type) {
   return opt_type ?
     opt_type in this.listeners_ :
     Object.keys(this.listeners_).length > 0;
@@ -141,7 +141,7 @@ _ol_events_EventTarget_.prototype.hasListener = function(opt_type) {
  * @param {string} type Type.
  * @param {ol.EventsListenerFunctionType} listener Listener.
  */
-_ol_events_EventTarget_.prototype.removeEventListener = function(type, listener) {
+EventTarget.prototype.removeEventListener = function(type, listener) {
   var listeners = this.listeners_[type];
   if (listeners) {
     var index = listeners.indexOf(listener);
@@ -157,4 +157,4 @@ _ol_events_EventTarget_.prototype.removeEventListener = function(type, listener)
     }
   }
 };
-export default _ol_events_EventTarget_;
+export default EventTarget;

src/ol/pointer/PointerEventHandler.js

@@ -33,7 +33,7 @@
 
 import {inherits} from '../index.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventTarget_ from '../events/EventTarget.js';
+import EventTarget from '../events/EventTarget.js';
 import _ol_has_ from '../has.js';
 import _ol_pointer_EventType_ from '../pointer/EventType.js';
 import _ol_pointer_MouseSource_ from '../pointer/MouseSource.js';
@@ -48,7 +48,7 @@ import _ol_pointer_TouchSource_ from '../pointer/TouchSource.js';
  * @param {Element|HTMLDocument} element Viewport element.
  */
 var _ol_pointer_PointerEventHandler_ = function(element) {
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * @const
@@ -78,7 +78,7 @@ var _ol_pointer_PointerEventHandler_ = function(element) {
   this.registerSources();
 };
 
-inherits(_ol_pointer_PointerEventHandler_, _ol_events_EventTarget_);
+inherits(_ol_pointer_PointerEventHandler_, EventTarget);
 
 
 /**
@@ -399,7 +399,7 @@ _ol_pointer_PointerEventHandler_.prototype.wrapMouseEvent = function(eventType,
  */
 _ol_pointer_PointerEventHandler_.prototype.disposeInternal = function() {
   this.unregister_();
-  _ol_events_EventTarget_.prototype.disposeInternal.call(this);
+  EventTarget.prototype.disposeInternal.call(this);
 };
 
 

src/ol/structs/LRUCache.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import _ol_asserts_ from '../asserts.js';
-import _ol_events_EventTarget_ from '../events/EventTarget.js';
+import EventTarget from '../events/EventTarget.js';
 import EventType from '../events/EventType.js';
 
 /**
@@ -19,7 +19,7 @@ import EventType from '../events/EventType.js';
  */
 var _ol_structs_LRUCache_ = function(opt_highWaterMark) {
 
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * @type {number}
@@ -52,7 +52,7 @@ var _ol_structs_LRUCache_ = function(opt_highWaterMark) {
 
 };
 
-inherits(_ol_structs_LRUCache_, _ol_events_EventTarget_);
+inherits(_ol_structs_LRUCache_, EventTarget);
 
 
 /**

src/ol/style/IconImage.js

@@ -4,7 +4,7 @@
 import {inherits} from '../index.js';
 import {createCanvasContext2D} from '../dom.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventTarget_ from '../events/EventTarget.js';
+import EventTarget from '../events/EventTarget.js';
 import EventType from '../events/EventType.js';
 import _ol_ImageState_ from '../ImageState.js';
 import _ol_style_ from '../style.js';
@@ -22,7 +22,7 @@ import _ol_style_ from '../style.js';
 var _ol_style_IconImage_ = function(image, src, size, crossOrigin, imageState,
     color) {
 
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * @private
@@ -89,7 +89,7 @@ var _ol_style_IconImage_ = function(image, src, size, crossOrigin, imageState,
 
 };
 
-inherits(_ol_style_IconImage_, _ol_events_EventTarget_);
+inherits(_ol_style_IconImage_, EventTarget);
 
 
 /**

test/spec/ol/events.test.js

@@ -1,5 +1,5 @@
 import _ol_events_ from '../../../src/ol/events.js';
-import _ol_events_EventTarget_ from '../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../src/ol/events/EventTarget.js';
 
 describe('ol.events', function() {
   var add, remove, target;
@@ -199,7 +199,7 @@ describe('ol.events', function() {
 
   describe('Compatibility with ol.events.EventTarget', function() {
     it('does not register duplicated listeners', function() {
-      var target = new _ol_events_EventTarget_();
+      var target = new EventTarget();
       var listener = function() {};
       var key1 = _ol_events_.listen(target, 'foo', listener);
       expect(target.getListeners('foo')).to.eql([key1.boundListener]);
@@ -208,7 +208,7 @@ describe('ol.events', function() {
       expect(target.getListeners('foo')).to.eql([key1.boundListener]);
     });
     it('registers multiple listeners if this object is different', function() {
-      var target = new _ol_events_EventTarget_();
+      var target = new EventTarget();
       var listener = function() {};
       var key1 = _ol_events_.listen(target, 'foo', listener, {});
       var key2 = _ol_events_.listen(target, 'foo', listener, {});

test/spec/ol/events/eventtarget.test.js

@@ -1,7 +1,7 @@
 import _ol_Disposable_ from '../../../../src/ol/Disposable.js';
 import _ol_events_ from '../../../../src/ol/events.js';
 import Event from '../../../../src/ol/events/Event.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 
 
 describe('ol.events.EventTarget', function() {
@@ -17,12 +17,12 @@ describe('ol.events.EventTarget', function() {
     spy1 = spy.bind({id: 1});
     spy2 = spy.bind({id: 2});
     spy3 = spy.bind({id: 3});
-    eventTarget = new _ol_events_EventTarget_();
+    eventTarget = new EventTarget();
   });
 
   describe('constructor', function() {
     it('creates an instance', function() {
-      expect(eventTarget).to.be.a(_ol_events_EventTarget_);
+      expect(eventTarget).to.be.a(EventTarget);
       expect(eventTarget).to.be.a(_ol_Disposable_);
     });
     it('creates an empty listeners_ object', function() {

test/spec/ol/interaction/draganddrop.test.js

@@ -1,7 +1,7 @@
 import {inherits} from '../../../../src/ol/index.js';
 import _ol_View_ from '../../../../src/ol/View.js';
 import Event from '../../../../src/ol/events/Event.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 import _ol_format_GeoJSON_ from '../../../../src/ol/format/GeoJSON.js';
 import _ol_interaction_DragAndDrop_ from '../../../../src/ol/interaction/DragAndDrop.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -10,7 +10,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
   var viewport, map, interaction;
 
   beforeEach(function() {
-    viewport = new _ol_events_EventTarget_();
+    viewport = new EventTarget();
     map = {
       getViewport: function() {
         return viewport;
@@ -72,7 +72,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
     });
 
     it('registers and unregisters listeners on a custom target', function() {
-      var customTarget = new _ol_events_EventTarget_();
+      var customTarget = new EventTarget();
       interaction = new _ol_interaction_DragAndDrop_({
         formatConstructors: [_ol_format_GeoJSON_],
         target: customTarget
@@ -95,13 +95,13 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
       OrigFileReader = FileReader;
 
       FileReader = function() {
-        _ol_events_EventTarget_.apply(this, arguments);
+        EventTarget.apply(this, arguments);
         this.readAsText = function(file) {
           this.result = file;
           this.dispatchEvent('load');
         };
       };
-      inherits(FileReader, _ol_events_EventTarget_);
+      inherits(FileReader, EventTarget);
     });
 
     afterEach(function() {

test/spec/ol/interaction/interaction.test.js

@@ -1,6 +1,6 @@
 import _ol_Map_ from '../../../../src/ol/Map.js';
 import _ol_View_ from '../../../../src/ol/View.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
 
 describe('ol.interaction.Interaction', function() {
@@ -14,7 +14,7 @@ describe('ol.interaction.Interaction', function() {
 
     it('creates a new interaction', function() {
       expect(interaction).to.be.a(_ol_interaction_Interaction_);
-      expect(interaction).to.be.a(_ol_events_EventTarget_);
+      expect(interaction).to.be.a(EventTarget);
     });
 
     it('creates an active interaction', function() {

test/spec/ol/observable.test.js

@@ -1,4 +1,4 @@
-import _ol_events_EventTarget_ from '../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../src/ol/events/EventTarget.js';
 import _ol_Observable_ from '../../../src/ol/Observable.js';
 
 
@@ -9,7 +9,7 @@ describe('ol.Observable', function() {
     it('creates a new observable', function() {
       var observable = new _ol_Observable_();
       expect(observable).to.be.a(_ol_Observable_);
-      expect(observable).to.be.a(_ol_events_EventTarget_);
+      expect(observable).to.be.a(EventTarget);
     });
 
   });

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

@@ -1,5 +1,5 @@
 import _ol_events_ from '../../../../src/ol/events.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 import _ol_has_ from '../../../../src/ol/has.js';
 import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js';
 import _ol_pointer_TouchSource_ from '../../../../src/ol/pointer/TouchSource.js';
@@ -13,7 +13,7 @@ describe('ol.pointer.MouseSource', function() {
 
   beforeEach(function() {
     clock = sinon.useFakeTimers();
-    target = new _ol_events_EventTarget_();
+    target = new EventTarget();
 
     // make sure that a mouse and touch event source is used
     _ol_has_.POINTER = false;

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

@@ -1,5 +1,5 @@
 import _ol_events_ from '../../../../src/ol/events.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 import _ol_has_ from '../../../../src/ol/has.js';
 import _ol_pointer_MouseSource_ from '../../../../src/ol/pointer/MouseSource.js';
 import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
@@ -12,7 +12,7 @@ describe('ol.pointer.PointerEventHandler', function() {
   var eventSpy;
 
   beforeEach(function() {
-    target = new _ol_events_EventTarget_();
+    target = new EventTarget();
 
     // make sure that a mouse event source is used
     _ol_has_.POINTER = false;

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

@@ -1,6 +1,6 @@
 import _ol_events_ from '../../../../src/ol/events.js';
 import Event from '../../../../src/ol/events/Event.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 import _ol_has_ from '../../../../src/ol/has.js';
 import _ol_obj_ from '../../../../src/ol/obj.js';
 import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js';
@@ -10,7 +10,7 @@ describe('ol.pointer.TouchSource', function() {
   var eventSpy;
 
   beforeEach(function() {
-    target = new _ol_events_EventTarget_();
+    target = new EventTarget();
 
     // make sure that a mouse and touch event source is used
     _ol_has_.POINTER = false;