Refactor: e -> event or error, err -> error, p -> pointer (#831)

* Refactor: e -> event or error, err -> error, p -> pointer

* simplify
This commit is contained in:
Lipis 2020-02-28 23:03:53 +01:00 committed by GitHub
parent d2827aa40b
commit 097c5dfad7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 190 additions and 185 deletions

View file

@ -28,7 +28,7 @@ export async function copyToAppClipboard(
// copied elements, and thus we should prefer the text content.
await copyTextToSystemClipboard(null);
PREFER_APP_CLIPBOARD = false;
} catch (err) {
} catch (error) {
// if clearing system clipboard didn't work, we should prefer in-app
// clipboard even if there's text in system clipboard on paste, because
// we can't be sure of the order of copy operations
@ -49,30 +49,30 @@ export function getAppClipboard(): {
) {
return { elements: clipboardElements };
}
} catch (err) {
console.error(err);
} catch (error) {
console.error(error);
}
return {};
}
export async function getClipboardContent(
e: ClipboardEvent | null,
event: ClipboardEvent | null,
): Promise<{
text?: string;
elements?: readonly ExcalidrawElement[];
}> {
try {
const text = e
? e.clipboardData?.getData("text/plain").trim()
const text = event
? event.clipboardData?.getData("text/plain").trim()
: probablySupportsClipboardReadText &&
(await navigator.clipboard.readText());
if (text && !PREFER_APP_CLIPBOARD) {
return { text };
}
} catch (err) {
console.error(err);
} catch (error) {
console.error(error);
}
return getAppClipboard();
@ -87,12 +87,12 @@ export async function copyCanvasToClipboardAsPng(canvas: HTMLCanvasElement) {
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (err) {
reject(err);
} catch (error) {
reject(error);
}
});
} catch (err) {
reject(err);
} catch (error) {
reject(error);
}
});
}
@ -105,7 +105,7 @@ export async function copyTextToSystemClipboard(text: string | null) {
// not focused
await navigator.clipboard.writeText(text || "");
copied = true;
} catch (err) {}
} catch (error) {}
}
// Note that execCommand doesn't allow copying empty strings, so if we're
@ -143,7 +143,7 @@ function copyTextViaExecCommand(text: string) {
textarea.setSelectionRange(0, textarea.value.length);
success = document.execCommand("copy");
} catch (err) {}
} catch (error) {}
textarea.remove();