imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modify design according to the design team

Browse source
This commit is contained in:
Jaiwanth 2021-07-26 00:09:59 +05:30
parent c81bac1a4c
commit 3d4d1d32d9
6 changed files with 154 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/utils/exportUtils/Exporter.ts
View file

@ -44,7 +44,7 @@ export default abstract class Exporter {
protected updateProgress(progress: string, log = true, show = true): void {
if (log) console.log(progress);
if (show) this.exportProgressRef.current.innerText = progress;
if (show && this.exportProgressRef.current) this.exportProgressRef.current.innerText = progress;
}
protected addFile(filePath: string, blob: Blob): void {
@ -64,7 +64,7 @@ export default abstract class Exporter {
// Create a writable stream to the directory
this.fileStream = streamSaver.createWriteStream(filename);
if (!this.cancelled) this.updateProgress("Generating a ZIP...");
if (!this.cancelled) this.updateProgress("Generating a ZIP");
else return this.cleanUp();
this.writer = this.fileStream.getWriter();
@ -79,7 +79,7 @@ export default abstract class Exporter {
if (this.cancelled) return this.cleanUp();
this.updateProgress("Writing to the file system...");
this.updateProgress("Writing to the file system");
const reader = readableZipStream.getReader();
await this.pumpToFileStream(reader);
@ -186,8 +186,8 @@ export default abstract class Exporter {
}
this.updateProgress(
("Fetched " + events.length + " events ") + (this.exportType === exportTypes.LAST_N_MESSAGES
? `out of ${this.exportOptions.numberOfMessages}...`
: "so far..."),
? `out of ${this.exportOptions.numberOfMessages}`
: "so far"),
);
prevToken = res.end;
}

4
src/utils/exportUtils/HtmlExport.tsx
View file

@ -361,8 +361,8 @@ export default class HTMLExporter extends Exporter {
}
public async export() {
this.updateProgress("Starting export process...", true, false);
this.updateProgress("Fetching events...");
this.updateProgress("Starting export process", true, false);
this.updateProgress("Fetching events");
const fetchStart = performance.now();
const res = await this.getRequiredEvents();

2
src/utils/exportUtils/exportUtils.ts
View file

@ -29,7 +29,7 @@ export const textForType = (type: string): string => {
case exportTypes.BEGINNING:
return _t("From the beginning");
case exportTypes.LAST_N_MESSAGES:
return _t("For a number of messages");
return _t("Specify a number of messages");
case exportTypes.TIMELINE:
return _t("Current Timeline");
// case exportTypes.START_DATE: