Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-22 23:23:54 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(mail-merge): Upload files per draft to fix inline images

Browse source
This commit is contained in:
Ben Gotow 2016-10-24 12:32:53 -07:00
parent 8b2cebe093
commit 9b3c524cf9
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/flux/stores/draft-helpers.es6
View file

@ -66,12 +66,6 @@ export function messageMentionsAttachment({body} = {}) {
return (cleaned.indexOf("attach") >= 0);
}
export function queueDraftFileUploads(draft) {
if (draft.files.length > 0 || draft.uploads.length > 0) {
Actions.queueTask(new SyncbackDraftFilesTask(draft.clientId))
}
}
export function appendQuotedTextToDraft(draft) {
const query = DatabaseStore.find(Message, draft.replyToMessageId).include(Message.attributes.body);
@ -135,9 +129,11 @@ export function prepareDraftForSyncback(session) {
return DatabaseStore.inTransaction((t) =>
t.persistModel(draft)
)
.then(() =>
Promise.resolve(queueDraftFileUploads(draft))
)
.then(() => {
if (draft.files.length > 0 || draft.uploads.length > 0) {
Actions.queueTask(new SyncbackDraftFilesTask(draft.clientId))
}
})
.thenReturn(draft)
})
}

2
src/pro

@ -1 +1 @@
Subproject commit 6ac68bb4961cd303f7d1d4aad0920687dda988ff
Subproject commit 773d754ba1936246888d5eec2f8de894ff686c80