infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 11:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

in webmail, automatically mark message as nonjunk when open for 5 seconds, and prevent extraneous newlines when composing a reply to selected text

Browse Source
This commit is contained in:
Mechiel Lukkien 2023-08-09 09:45:54 +02:00
parent 34ede1075d
commit 20ebdae8ea
No known key found for this signature in database
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webmail/webmail.js
View File

@ -2055,7 +2055,6 @@ const compose = (opts) => {
let haveFrom = false; let haveFrom = false;
const fromOptions = accountAddresses.map(a => { const fromOptions = accountAddresses.map(a => {
const selected = opts.from && opts.from.length === 1 && equalAddress(a, opts.from[0]) || loginAddress && equalAddress(a, loginAddress) && (!opts.from || envelopeIdentity(opts.from)); const selected = opts.from && opts.from.length === 1 && equalAddress(a, opts.from[0]) || loginAddress && equalAddress(a, loginAddress) && (!opts.from || envelopeIdentity(opts.from));
log('fromOptions', a, selected, loginAddress, equalAddress(a, loginAddress));
const o = dom.option(formatAddressFull(a), selected ? attr.selected('') : []); const o = dom.option(formatAddressFull(a), selected ? attr.selected('') : []);
if (selected) { if (selected) {
haveFrom = true; haveFrom = true;
@ -2608,7 +2607,7 @@ const newMsgView = (miv, msglistView, listMailboxes, possibleLabels, messageLoad
// text to use when writing a reply. We still set url so the text content can be // text to use when writing a reply. We still set url so the text content can be
// opened in a separate tab, even though it will look differently. // opened in a separate tab, even though it will look differently.
urlType = 'text'; urlType = 'text';
const elem = dom.div(dom._class('mono'), style({ whiteSpace: 'pre-wrap' }), join((pm.Texts || []).map(t => renderText(t)), () => dom.hr(style({ margin: '2ex 0' })))); const elem = dom.div(dom._class('mono'), style({ whiteSpace: 'pre-wrap' }), join((pm.Texts || []).map(t => renderText(t.replace(/\r\n/g, '\n'))), () => dom.hr(style({ margin: '2ex 0' }))));
dom._kids(msgcontentElem); dom._kids(msgcontentElem);
dom._kids(msgscrollElem, elem); dom._kids(msgscrollElem, elem);
dom._kids(msgcontentElem, msgscrollElem); dom._kids(msgcontentElem, msgscrollElem);
@ -2702,6 +2701,13 @@ const newMsgView = (miv, msglistView, listMailboxes, possibleLabels, messageLoad
} }
}, 500); }, 500);
} }
if (!miv.messageitem.Message.Junk && !miv.messageitem.Message.Notjunk) {
window.setTimeout(async () => {
if (!miv.messageitem.Message.Junk && !miv.messageitem.Message.Notjunk && miv.messageitem.Message.ID === msglistView.activeMessageID()) {
await withStatus('Marking current message as not junk', client.FlagsAdd([miv.messageitem.Message.ID], ['$notjunk']));
}
}, 5 * 1000);
}
})(); })();
return mv; return mv;
}; };

10
webmail/webmail.ts
View File

@ -1319,7 +1319,6 @@ const compose = (opts: ComposeOptions) => {
let haveFrom = false let haveFrom = false
const fromOptions = accountAddresses.map(a => { const fromOptions = accountAddresses.map(a => {
const selected = opts.from && opts.from.length === 1 && equalAddress(a, opts.from[0]) || loginAddress && equalAddress(a, loginAddress) && (!opts.from || envelopeIdentity(opts.from)) const selected = opts.from && opts.from.length === 1 && equalAddress(a, opts.from[0]) || loginAddress && equalAddress(a, loginAddress) && (!opts.from || envelopeIdentity(opts.from))
log('fromOptions', a, selected, loginAddress, equalAddress(a, loginAddress!))
const o = dom.option(formatAddressFull(a), selected ? attr.selected('') : []) const o = dom.option(formatAddressFull(a), selected ? attr.selected('') : [])
if (selected) { if (selected) {
haveFrom = true haveFrom = true
@ -2206,7 +2205,7 @@ const newMsgView = (miv: MsgitemView, msglistView: MsglistView, listMailboxes: l
urlType = 'text' urlType = 'text'
const elem = dom.div(dom._class('mono'), const elem = dom.div(dom._class('mono'),
style({whiteSpace: 'pre-wrap'}), style({whiteSpace: 'pre-wrap'}),
join((pm.Texts || []).map(t => renderText(t)), () => dom.hr(style({margin: '2ex 0'}))), join((pm.Texts || []).map(t => renderText(t.replace(/\r\n/g, '\n'))), () => dom.hr(style({margin: '2ex 0'}))),
) )
dom._kids(msgcontentElem) dom._kids(msgcontentElem)
dom._kids(msgscrollElem, elem) dom._kids(msgscrollElem, elem)
@ -2336,6 +2335,13 @@ const newMsgView = (miv: MsgitemView, msglistView: MsglistView, listMailboxes: l
} }
}, 500) }, 500)
} }
if (!miv.messageitem.Message.Junk && !miv.messageitem.Message.Notjunk) {
window.setTimeout(async () => {
if (!miv.messageitem.Message.Junk && !miv.messageitem.Message.Notjunk && miv.messageitem.Message.ID === msglistView.activeMessageID()) {
await withStatus('Marking current message as not junk', client.FlagsAdd([miv.messageitem.Message.ID], ['$notjunk']))
}
}, 5*1000)
}
})() })()
return mv return mv