alex/yomichan
1
Fork 0
Code Releases Activity

Update ClipboardReader.getImage implementation (#2085)

Browse Source
This commit is contained in:
toasted-nutbread 2022-03-13 21:17:48 -04:00 committed by GitHub
parent f98f5f9395
commit 59ae55252e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/js/comm/clipboard-reader.js
View File

@ -113,17 +113,24 @@ class ClipboardReader {
typeof navigator.clipboard !== 'undefined' && typeof navigator.clipboard !== 'undefined' &&
typeof navigator.clipboard.read === 'function' typeof navigator.clipboard.read === 'function'
) { ) {
// This function is behind the Firefox flag: dom.events.asyncClipboard.dataTransfer // This function is behind the Firefox flag: dom.events.asyncClipboard.read
let files; // See: https://developer.mozilla.org/en-US/docs/Web/API/Clipboard/read#browser_compatibility
let items;
try { try {
({files} = await navigator.clipboard.read()); items = await navigator.clipboard.read();
} catch (e) { } catch (e) {
return null; return null;
} }
for (const file of files) { for (const item of items) {
if (MediaUtil.getFileExtensionFromImageMediaType(file.type) !== null) { for (const type of item.types) {
return await this._readFileAsDataURL(file); if (!MediaUtil.getFileExtensionFromImageMediaType(type)) { continue; }
try {
const blob = await item.getType(type);
return await this._readFileAsDataURL(blob);
} catch (e) {
// NOP
}
} }
} }
return null; return null;