From 94c3d112396538142a94a68beb9873aea033a137 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 8 Oct 2022 09:11:28 -0700 Subject: [PATCH] Fix compile --- src/browser/services/CharSizeService.ts | 6 ++++-- src/common/services/UnicodeService.ts | 11 ++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/browser/services/CharSizeService.ts b/src/browser/services/CharSizeService.ts index 80116f00..267a361b 100644 --- a/src/browser/services/CharSizeService.ts +++ b/src/browser/services/CharSizeService.ts @@ -4,10 +4,11 @@ */ import { IOptionsService } from 'common/services/Services'; -import { IEvent, EventEmitter } from 'common/EventEmitter'; +import { EventEmitter } from 'common/EventEmitter'; import { ICharSizeService } from 'browser/services/Services'; +import { Disposable } from 'common/Lifecycle'; -export class CharSizeService implements ICharSizeService { +export class CharSizeService extends Disposable implements ICharSizeService { public serviceBrand: undefined; public width: number = 0; @@ -24,6 +25,7 @@ export class CharSizeService implements ICharSizeService { parentElement: HTMLElement, @IOptionsService private readonly _optionsService: IOptionsService ) { + super(); this._measureStrategy = new DomMeasureStrategy(document, parentElement, this._optionsService); } diff --git a/src/common/services/UnicodeService.ts b/src/common/services/UnicodeService.ts index 44386e54..5c5b74f6 100644 --- a/src/common/services/UnicodeService.ts +++ b/src/common/services/UnicodeService.ts @@ -5,27 +5,28 @@ import { IUnicodeService, IUnicodeVersionProvider } from 'common/services/Services'; import { EventEmitter, IEvent } from 'common/EventEmitter'; import { UnicodeV6 } from 'common/input/UnicodeV6'; -import { Disposable } from 'common/Lifecycle'; - -export class UnicodeService extends Disposable implements IUnicodeService { +export class UnicodeService implements IUnicodeService { public serviceBrand: any; private _providers: {[key: string]: IUnicodeVersionProvider} = Object.create(null); private _active: string = ''; private _activeProvider: IUnicodeVersionProvider; - private readonly _onChange = super.register(new EventEmitter(); + private readonly _onChange = new EventEmitter(); public readonly onChange = this._onChange.event; constructor() { - super(); const defaultProvider = new UnicodeV6(); this.register(defaultProvider); this._active = defaultProvider.version; this._activeProvider = defaultProvider; } + public dispose(): void { + this._onChange.dispose(); + } + public get versions(): string[] { return Object.keys(this._providers); }