From 2fa2e567a6014a5144009a7b688b7e554325d66f Mon Sep 17 00:00:00 2001 From: Surma Date: Wed, 19 Dec 2018 13:58:03 +0000 Subject: [PATCH] Address minor nits --- src/components/App/client-api.ts | 44 +++++++++++++++---------------- src/components/compress/index.tsx | 4 +-- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/components/App/client-api.ts b/src/components/App/client-api.ts index b54912ad..b96406c5 100644 --- a/src/components/App/client-api.ts +++ b/src/components/App/client-api.ts @@ -6,67 +6,67 @@ const API_VERSION = 1; export function exposeAPI(app: App) { self.parent.postMessage({ type: 'READY', version: API_VERSION }, '*'); - self.addEventListener('message', (ev: MessageEvent) => { - if (ev.data !== 'READY?') { + self.addEventListener('message', (event: MessageEvent) => { + if (event.data !== 'READY?') { return; } - ev.stopPropagation(); + event.stopImmediatePropagation(); self.parent.postMessage({ type: 'READY', version: API_VERSION }, '*'); }); expose(new API(app), self.parent); } class API { - constructor(private app: App) { } + constructor(private _app: App) { } - async setFile(blob: Blob, name: string) { - return new Promise(async (resolve) => { + setFile(blob: Blob, name: string) { + return new Promise((resolve) => { document.addEventListener( 'squoosh:processingstart', () => resolve(), { once: true }, ); - this.app.openFile(new File([blob], name)); + this._app.openFile(new File([blob], name)); }); } - async getBlob(side: 0 | 1) { - if (!this.app.state.file || !this.app.compressInstance) { + getBlob(side: 0 | 1) { + if (!this._app.state.file || !this._app.compressInstance) { throw new Error('No file has been loaded'); } if ( - !this.app.compressInstance!.state.loading && - !this.app.compressInstance!.state.sides[side].loading + !this._app.compressInstance!.state.loading && + !this._app.compressInstance!.state.sides[side].loading ) { - return this.app.compressInstance!.state.sides[side].file; + return this._app.compressInstance!.state.sides[side].file; } return new Promise((resolve, reject) => { document.addEventListener( 'squoosh:processingdone', - (ev) => { - if ((ev as CustomEvent).detail.side !== side) { + (event) => { + if ((event as CustomEvent).detail.side !== side) { return; } - resolve(this.app.compressInstance!.state.sides[side].file); + resolve(this._app.compressInstance!.state.sides[side].file); }, ); document.addEventListener( 'squoosh:processingabort', - (ev) => { - if ((ev as CustomEvent).detail.side !== side) { + (event) => { + if ((event as CustomEvent).detail.side !== side) { return; } - reject('aborted'); + reject(new DOMException('Aborted', 'AbortError')); }, ); document.addEventListener( - 'squoosh:processingerroor', - (ev) => { - if ((ev as CustomEvent).detail.side !== side) { + 'squoosh:processingerror', + (event) => { + if ((event as CustomEvent).detail.side !== side) { return; } - reject((ev as CustomEvent).detail.msg); + reject(new Error((event as CustomEvent).detail.msg)); }, ); }); diff --git a/src/components/compress/index.tsx b/src/components/compress/index.tsx index c1747b9e..e6d0cbff 100644 --- a/src/components/compress/index.tsx +++ b/src/components/compress/index.tsx @@ -465,7 +465,7 @@ export default class Compress extends Component { this.updateImageTimeoutIds[index] = self.setTimeout( () => { - this.updateImage(index, options) .catch((err) => { + this.updateImage(index, options).catch((err) => { console.error(err); }); }, @@ -560,7 +560,7 @@ export default class Compress extends Component { } } catch (err) { if (err.name === 'AbortError') { - this.signalProcessingAbort(index as 0 | 1); + this.signalProcessingAbort(index as 0|1); return; } const errorMsg = `Processing error (type=${settings.encoderState.type}): ${err}`;