From 566e7bc8d6cb655a187c7cd6bcf89ec409d3e19e Mon Sep 17 00:00:00 2001 From: Jaiwanth Date: Fri, 25 Jun 2021 15:49:39 +0530 Subject: [PATCH] format --- src/utils/exportUtils/HtmlExport.tsx | 9 ++++++--- src/utils/exportUtils/JSONExport.ts | 7 +++++-- src/utils/exportUtils/PlainTextExport.ts | 8 ++++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx index 7b36439ad5..33d0e78915 100644 --- a/src/utils/exportUtils/HtmlExport.tsx +++ b/src/utils/exportUtils/HtmlExport.tsx @@ -324,20 +324,20 @@ export default class HTMLExporter extends Exporter { public async export() { console.info("Starting export process..."); console.info("Fetching events..."); + const fetchStart = performance.now(); const res = await this.getRequiredEvents(); const fetchEnd = performance.now(); console.log(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`); - console.info("Creating HTML..."); + console.info("Creating HTML..."); const html = await this.createHTML(res); this.addFile("index.html", new Blob([html])); this.addFile("css/style.css", new Blob([exportCSS])); this.addFile("js/script.js", new Blob([exportJS])); - for (const iconName in exportIcons) { this.addFile(`icons/${iconName}`, new Blob([exportIcons[iconName]])); } @@ -347,7 +347,10 @@ export default class HTMLExporter extends Exporter { await this.downloadZIP(); const exportEnd = performance.now(); - console.info(`Export Successful! Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); + + console.info("Export successful!") + console.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); + window.removeEventListener("beforeunload", this.onBeforeUnload); window.removeEventListener("onunload", this.abortExport); } diff --git a/src/utils/exportUtils/JSONExport.ts b/src/utils/exportUtils/JSONExport.ts index 4612a37481..d25d96b2e4 100644 --- a/src/utils/exportUtils/JSONExport.ts +++ b/src/utils/exportUtils/JSONExport.ts @@ -73,13 +73,14 @@ ${json} public async export() { console.info("Starting export process..."); console.info("Fetching events..."); + const fetchStart = performance.now(); const res = await this.getRequiredEvents(); const fetchEnd = performance.now(); console.log(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`); - console.info("Creating output..."); + console.info("Creating output..."); const text = await this.createOutput(res); if (this.files.length) { @@ -91,8 +92,10 @@ ${json} } const exportEnd = performance.now(); - console.info(`Export successful!`) + + console.info("Export successful!") console.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); + window.removeEventListener("beforeunload", this.onBeforeUnload); window.removeEventListener("onunload", this.abortExport); } diff --git a/src/utils/exportUtils/PlainTextExport.ts b/src/utils/exportUtils/PlainTextExport.ts index f8bb6fe34e..a207029955 100644 --- a/src/utils/exportUtils/PlainTextExport.ts +++ b/src/utils/exportUtils/PlainTextExport.ts @@ -91,13 +91,14 @@ export default class PlainTextExporter extends Exporter { public async export() { console.info("Starting export process..."); console.info("Fetching events..."); + const fetchStart = performance.now(); const res = await this.getRequiredEvents(); const fetchEnd = performance.now(); console.log(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`); - console.info("Creating Output..."); + console.info("Creating output..."); const text = await this.createOutput(res); if (this.files.length) { @@ -109,7 +110,10 @@ export default class PlainTextExporter extends Exporter { } const exportEnd = performance.now(); - console.info(`Export Successful! Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); + + console.info("Export successful!") + console.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); + window.removeEventListener("onunload", this.abortExport); window.removeEventListener("beforeunload", this.onBeforeUnload); }