From ae8d4c1bbde4048e42e7e72d478b66c0496c6515 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sun, 13 Sep 2020 23:03:20 -0500 Subject: [PATCH] Ref: attachment image paste --- client/components/cards/attachments.js | 42 ++++++++++++++------------ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js index 32c85e892..f9907ebf3 100644 --- a/client/components/cards/attachments.js +++ b/client/components/cards/attachments.js @@ -67,7 +67,6 @@ Template.cardAttachmentsPopup.events({ const uploader = Attachments.insert( { file: event.currentTarget.files[0], - streams: 'dynamic', chunkSize: 'dynamic', }, false, @@ -136,26 +135,29 @@ Template.previewClipboardImagePopup.events({ if (results && results.file) { window.oPasted = pastedResults; const card = this; - const file = new FS.File(results.file); - if (!results.name) { - // if no filename, it's from clipboard. then we give it a name, with ext name from MIME type - if (typeof results.file.type === 'string') { - file.name(results.file.type.replace('image/', 'clipboard.')); + const uploader = Attachments.insert( + { + file: results.file, + fileName: + results.name || results.file.type.replace('image/', 'clipboard.'), + chunkSize: 'dynamic', + }, + false, + ); + uploader.on('uploaded', (error, fileObj) => { + if (!error) { + if (fileObj.isImage) { + card.setCover(fileObj._id); + } + Utils.addCommonMetaToAttachment(card, fileObj); } - } - file.updatedAt(new Date()); - file.boardId = card.boardId; - file.cardId = card._id; - file.userId = Meteor.userId(); - const attachment = Attachments.insert(file); - - if (attachment && attachment._id && attachment.isImage()) { - card.setCover(attachment._id); - } - - pastedResults = null; - $(document.body).pasteImageReader(() => {}); - Popup.back(); + }); + uploader.on('end', (error, fileObj) => { + pastedResults = null; + $(document.body).pasteImageReader(() => {}); + Popup.back(); + }); + uploader.start(); } }, });