Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 12:39:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:the-djmaze/snappymail

Browse source
This commit is contained in:
the-djmaze 2023-05-15 15:16:29 +02:00
commit 0bd5603dd0
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dev/Common/Html.js
View file

@ -289,6 +289,9 @@ export const
+ (0 < bqLevel ? ',' + (new Array(1 + bqLevel).fill('blockquote').join(' ')) : '')
).forEach(oElement => oElement.remove());
// https://github.com/the-djmaze/snappymail/issues/1125
tmpl.content.querySelectorAll('form,button').forEach(oElement => replaceWithChildren(oElement));
[...tmpl.content.querySelectorAll('*')].forEach(oElement => {
const name = oElement.tagName,
oStyle = oElement.style;
@ -394,7 +397,7 @@ export const
}
// if (['CENTER','FORM'].includes(name)) {
if ('FORM' === name || 'O:P' === name || (nonEmptyTags.includes(name) && ('' == oElement.textContent.trim()))) {
if ('O:P' === name || (nonEmptyTags.includes(name) && ('' == oElement.textContent.trim()))) {
('A' !== name || !oElement.querySelector('IMG')) && replaceWithChildren(oElement);
return;
}

9
dev/View/Popup/Compose.js
View file

@ -1356,7 +1356,7 @@ export class ComposePopupView extends AbstractViewPopup {
async getMessageRequestParams(sSaveFolder, draft)
{
let Text = this.oEditor.getData().trim(),
l = Text.length,
l,
hasAttachments = 0;
// Prepare ComposeAttachmentModel attachments
@ -1374,10 +1374,6 @@ export class ComposePopupView extends AbstractViewPopup {
}
});
if (!draft && !l && !hasAttachments) {
throw i18n('COMPOSE/ERROR_EMPTY_BODY');
}
const
identity = this.currentIdentity(),
params = {
@ -1426,6 +1422,9 @@ export class ComposePopupView extends AbstractViewPopup {
? await this.mailvelope.createDraft()
: await this.mailvelope.encrypt(recipients);
} else if (sign || encrypt) {
if (!draft && !hasAttachments && !Text.length) {
throw i18n('COMPOSE/ERROR_EMPTY_BODY');
}
let data = new MimePart;
data.headers['Content-Type'] = 'text/'+(isHtml?'html':'plain')+'; charset="utf-8"';
data.headers['Content-Transfer-Encoding'] = 'base64';