Rename EventEmitter2 to EventEmitter

Fixes #2029

src/browser/TestUtils.test.ts

@@ -3,12 +3,12 @@
  * @license MIT
  */
 
-import { IEvent, EventEmitter2 } from 'common/EventEmitter2';
+import { IEvent, EventEmitter } from 'common/EventEmitter';
 import { ICharSizeService } from 'browser/services/Services';
 
 export class MockCharSizeService implements ICharSizeService {
   get hasValidSize(): boolean { return this.width > 0 && this.height > 0; }
-  onCharSizeChange: IEvent<void> = new EventEmitter2<void>().event;
+  onCharSizeChange: IEvent<void> = new EventEmitter<void>().event;
   constructor(public width: number, public height: number) {}
   measure(): void {}
 }

src/browser/services/CharSizeService.ts

@@ -4,7 +4,7 @@
  */
 
 import { IOptionsService } from 'common/services/Services';
-import { IEvent, EventEmitter2 } from 'common/EventEmitter2';
+import { IEvent, EventEmitter } from 'common/EventEmitter';
 import { ICharSizeService } from 'browser/services/Services';
 
 export class CharSizeService implements ICharSizeService {
@@ -14,7 +14,7 @@ export class CharSizeService implements ICharSizeService {
 
   public get hasValidSize(): boolean { return this.width > 0 && this.height > 0; }
 
-  private _onCharSizeChange = new EventEmitter2<void>();
+  private _onCharSizeChange = new EventEmitter<void>();
   public get onCharSizeChange(): IEvent<void> { return this._onCharSizeChange.event; }
 
   constructor(

src/browser/services/RenderService.ts

@@ -5,7 +5,7 @@
 
 import { IRenderer, IRenderDimensions, CharacterJoinerHandler } from 'browser/renderer/Types';
 import { RenderDebouncer } from 'browser/RenderDebouncer';
-import { EventEmitter2, IEvent } from 'common/EventEmitter2';
+import { EventEmitter, IEvent } from 'common/EventEmitter';
 import { Disposable } from 'common/Lifecycle';
 import { ScreenDprMonitor } from 'browser/ScreenDprMonitor';
 import { addDisposableDomListener } from 'browser/Lifecycle';
@@ -22,11 +22,11 @@ export class RenderService extends Disposable implements IRenderService {
   private _canvasWidth: number = 0;
   private _canvasHeight: number = 0;
 
-  private _onDimensionsChange = new EventEmitter2<IRenderDimensions>();
+  private _onDimensionsChange = new EventEmitter<IRenderDimensions>();
   public get onDimensionsChange(): IEvent<IRenderDimensions> { return this._onDimensionsChange.event; }
-  private _onRender = new EventEmitter2<{ start: number, end: number }>();
+  private _onRender = new EventEmitter<{ start: number, end: number }>();
   public get onRender(): IEvent<{ start: number, end: number }> { return this._onRender.event; }
-  private _onRefreshRequest = new EventEmitter2<{ start: number, end: number }>();
+  private _onRefreshRequest = new EventEmitter<{ start: number, end: number }>();
   public get onRefreshRequest(): IEvent<{ start: number, end: number }> { return this._onRefreshRequest.event; }
 
   public get dimensions(): IRenderDimensions { return this._renderer.dimensions; }

src/browser/services/Services.d.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IEvent } from 'common/EventEmitter2';
+import { IEvent } from 'common/EventEmitter';
 import { IRenderDimensions, IRenderer, CharacterJoinerHandler } from 'browser/renderer/Types';
 import { IColorSet } from 'browser/Types';