monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-02-27 16:24:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

using await to reduce indentation

Browse source 
always opening a new tab if copying to clipboard failed (not just firefox)
closes #2815
This commit is contained in:
Miodec 2023-03-21 14:58:09 +01:00
parent 58d092070e
commit 59e9790874
1 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
frontend/src/ts/test/test-ui.ts
View file

@ -452,49 +452,43 @@ export async function screenshot(): Promise<void> {
try {
const paddingX = Misc.convertRemToPixels(2);
const paddingY = Misc.convertRemToPixels(2);
html2canvas(document.body, {
const canvas = await html2canvas(document.body, {
backgroundColor: await ThemeColors.get("bg"),
width: sourceWidth + paddingX * 2,
height: sourceHeight + paddingY * 2,
x: sourceX - paddingX,
y: sourceY - paddingY,
}).then((canvas) => {
canvas.toBlob((blob) => {
try {
if (blob === null) return;
if (navigator.userAgent.toLowerCase().indexOf("firefox") > -1) {
open(URL.createObjectURL(blob));
revertScreenshot();
} else {
navigator.clipboard
.write([
new ClipboardItem(
Object.defineProperty({}, blob.type, {
value: blob,
enumerable: true,
})
),
])
.then(() => {
Notifications.add("Copied to clipboard", 1, 2);
revertScreenshot();
})
.catch((e) => {
Notifications.add(
Misc.createErrorMessage(e, "Error saving image to clipboard"),
-1
);
revertScreenshot();
});
}
} catch (e) {
});
canvas.toBlob(async (blob) => {
try {
if (blob === null) {
throw new Error("Could not create imgage, blob is null");
}
const clipItem = new ClipboardItem(
Object.defineProperty({}, blob.type, {
value: blob,
enumerable: true,
})
);
await navigator.clipboard.write([clipItem]);
Notifications.add("Copied to clipboard", 1, 2);
} catch (e) {
console.error("Error while saving image to clipboard", e);
if (blob) {
Notifications.add(
"Could not save image to clipboard. Opening in new tab instead (make sure popups are allowed)",
0,
5
);
open(URL.createObjectURL(blob));
} else {
Notifications.add(
Misc.createErrorMessage(e, "Error saving image to clipboard"),
-1
);
revertScreenshot();
}
});
}
revertScreenshot();
});
} catch (e) {
Notifications.add(Misc.createErrorMessage(e, "Error creating image"), -1);