serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2024-12-26 16:33:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

webmail: top-post with no text selected and add "on ... wrote"-line, keep bottom-quoting with text selected

Browse source 
top-posting causes "On $datetime, $sender wrote:" above the quoted text to be
added (unless there was no Date header or valid address in a From header).

in the near future we should create settings, and add a setting for adding the
"on ... wrote"-line, ideally including a template.

for issue #83 by mattfbacon, thanks!
This commit is contained in:
Mechiel Lukkien 2023-10-13 19:28:04 +02:00
parent 7d28d80191
commit 8640fd8cff
No known key found for this signature in database
2 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
webmail/webmail.js
View file

@ -2145,7 +2145,7 @@ const compose = (opts) => {
maxWidth: '70em', maxWidth: '70em',
width: '40%', width: '40%',
borderRadius: '.25em', borderRadius: '.25em',
}), dom.form(fieldset = dom.fieldset(dom.table(style({ width: '100%' }), dom.tr(dom.td(style({ textAlign: 'right', color: '#555' }), dom.span('From:')), dom.td(dom.clickbutton('Cancel', style({ float: 'right' }), attr.title('Close window, discarding message.'), clickCmd(cmdCancel, shortcuts)), from = dom.select(attr.required(''), style({ width: 'auto' }), fromOptions), ' ', toBtn = dom.clickbutton('To', clickCmd(cmdAddTo, shortcuts)), ' ', ccBtn = dom.clickbutton('Cc', clickCmd(cmdAddCc, shortcuts)), ' ', bccBtn = dom.clickbutton('Bcc', clickCmd(cmdAddBcc, shortcuts)), ' ', replyToBtn = dom.clickbutton('ReplyTo', clickCmd(cmdReplyTo, shortcuts)), ' ', customFromBtn = dom.clickbutton('From', attr.title('Set custom From address/name.'), clickCmd(cmdCustomFrom, shortcuts)))), toRow = dom.tr(dom.td('To:', style({ textAlign: 'right', color: '#555' })), toCell = dom.td(style({ width: '100%' }))), replyToRow = dom.tr(dom.td('Reply-To:', style({ textAlign: 'right', color: '#555' })), replyToCell = dom.td(style({ width: '100%' }))), ccRow = dom.tr(dom.td('Cc:', style({ textAlign: 'right', color: '#555' })), ccCell = dom.td(style({ width: '100%' }))), bccRow = dom.tr(dom.td('Bcc:', style({ textAlign: 'right', color: '#555' })), bccCell = dom.td(style({ width: '100%' }))), dom.tr(dom.td('Subject:', style({ textAlign: 'right', color: '#555' })), dom.td(style({ width: '100%' }), subject = dom.input(focusPlaceholder('subject...'), attr.value(opts.subject || ''), attr.required(''), style({ width: '100%' }))))), body = dom.textarea(dom._class('mono'), attr.rows('15'), style({ width: '100%' }), opts.body || '', opts.body && !opts.isForward ? prop({ selectionStart: opts.body.length, selectionEnd: opts.body.length }) : [], function keyup(e) { }), dom.form(fieldset = dom.fieldset(dom.table(style({ width: '100%' }), dom.tr(dom.td(style({ textAlign: 'right', color: '#555' }), dom.span('From:')), dom.td(dom.clickbutton('Cancel', style({ float: 'right' }), attr.title('Close window, discarding message.'), clickCmd(cmdCancel, shortcuts)), from = dom.select(attr.required(''), style({ width: 'auto' }), fromOptions), ' ', toBtn = dom.clickbutton('To', clickCmd(cmdAddTo, shortcuts)), ' ', ccBtn = dom.clickbutton('Cc', clickCmd(cmdAddCc, shortcuts)), ' ', bccBtn = dom.clickbutton('Bcc', clickCmd(cmdAddBcc, shortcuts)), ' ', replyToBtn = dom.clickbutton('ReplyTo', clickCmd(cmdReplyTo, shortcuts)), ' ', customFromBtn = dom.clickbutton('From', attr.title('Set custom From address/name.'), clickCmd(cmdCustomFrom, shortcuts)))), toRow = dom.tr(dom.td('To:', style({ textAlign: 'right', color: '#555' })), toCell = dom.td(style({ width: '100%' }))), replyToRow = dom.tr(dom.td('Reply-To:', style({ textAlign: 'right', color: '#555' })), replyToCell = dom.td(style({ width: '100%' }))), ccRow = dom.tr(dom.td('Cc:', style({ textAlign: 'right', color: '#555' })), ccCell = dom.td(style({ width: '100%' }))), bccRow = dom.tr(dom.td('Bcc:', style({ textAlign: 'right', color: '#555' })), bccCell = dom.td(style({ width: '100%' }))), dom.tr(dom.td('Subject:', style({ textAlign: 'right', color: '#555' })), dom.td(style({ width: '100%' }), subject = dom.input(focusPlaceholder('subject...'), attr.value(opts.subject || ''), attr.required(''), style({ width: '100%' }))))), body = dom.textarea(dom._class('mono'), attr.rows('15'), style({ width: '100%' }), opts.body || '', opts.body && !opts.isForward && !opts.body.startsWith('\n\n') ? prop({ selectionStart: opts.body.length, selectionEnd: opts.body.length }) : [], function keyup(e) {
if (e.key === 'Enter') { if (e.key === 'Enter') {
checkAttachments(); checkAttachments();
} }
@ -2571,8 +2571,10 @@ const newMsgView = (miv, msglistView, listMailboxes, possibleLabels, messageLoad
const pm = await parsedMessagePromise; const pm = await parsedMessagePromise;
let body = ''; let body = '';
const sel = window.getSelection(); const sel = window.getSelection();
let haveSel = false;
if (sel && sel.toString()) { if (sel && sel.toString()) {
body = sel.toString(); body = sel.toString();
haveSel = true;
} }
else if (pm.Texts && pm.Texts.length > 0) { else if (pm.Texts && pm.Texts.length > 0) {
body = pm.Texts[0]; body = pm.Texts[0];
@ -2582,7 +2584,20 @@ const newMsgView = (miv, msglistView, listMailboxes, possibleLabels, messageLoad
body = '\n\n---- Forwarded Message ----\n\n' + body; body = '\n\n---- Forwarded Message ----\n\n' + body;
} }
else { else {
body = body.split('\n').map(line => '> ' + line).join('\n') + '\n\n'; body = body.split('\n').map(line => '> ' + line).join('\n');
if (haveSel) {
body += '\n\n';
}
else {
let onWroteLine = '';
if (mi.Envelope.Date && mi.Envelope.From && mi.Envelope.From.length === 1) {
const from = mi.Envelope.From[0];
const name = from.Name || formatEmailAddress(from);
const datetime = mi.Envelope.Date.toLocaleDateString(undefined, { weekday: "short", year: "numeric", month: "short", day: "numeric" }) + ' at ' + mi.Envelope.Date.toLocaleTimeString();
onWroteLine = 'On ' + datetime + ', ' + name + ' wrote:\n';
}
body = '\n\n' + onWroteLine + body;
}
} }
const subjectPrefix = forward ? 'Fwd:' : 'Re:'; const subjectPrefix = forward ? 'Fwd:' : 'Re:';
let subject = mi.Envelope.Subject || ''; let subject = mi.Envelope.Subject || '';

18
webmail/webmail.ts
View file

@ -1428,7 +1428,7 @@ const compose = (opts: ComposeOptions) => {
), ),
body=dom.textarea(dom._class('mono'), attr.rows('15'), style({width: '100%'}), body=dom.textarea(dom._class('mono'), attr.rows('15'), style({width: '100%'}),
opts.body || '', opts.body || '',
opts.body && !opts.isForward ? prop({selectionStart: opts.body.length, selectionEnd: opts.body.length}) : [], opts.body && !opts.isForward && !opts.body.startsWith('\n\n') ? prop({selectionStart: opts.body.length, selectionEnd: opts.body.length}) : [],
function keyup(e: KeyboardEvent) { function keyup(e: KeyboardEvent) {
if (e.key === 'Enter') { if (e.key === 'Enter') {
checkAttachments() checkAttachments()
@ -2037,8 +2037,10 @@ const newMsgView = (miv: MsgitemView, msglistView: MsglistView, listMailboxes: l
const pm = await parsedMessagePromise const pm = await parsedMessagePromise
let body = '' let body = ''
const sel = window.getSelection() const sel = window.getSelection()
let haveSel = false
if (sel && sel.toString()) { if (sel && sel.toString()) {
body = sel.toString() body = sel.toString()
haveSel = true
} else if (pm.Texts && pm.Texts.length > 0) { } else if (pm.Texts && pm.Texts.length > 0) {
body = pm.Texts[0] body = pm.Texts[0]
} }
@ -2046,7 +2048,19 @@ const newMsgView = (miv: MsgitemView, msglistView: MsglistView, listMailboxes: l
if (forward) { if (forward) {
body = '\n\n---- Forwarded Message ----\n\n'+body body = '\n\n---- Forwarded Message ----\n\n'+body
} else { } else {
body = body.split('\n').map(line => '> ' + line).join('\n') + '\n\n' body = body.split('\n').map(line => '> ' + line).join('\n')
if (haveSel) {
body += '\n\n'
} else {
let onWroteLine = ''
if (mi.Envelope.Date && mi.Envelope.From && mi.Envelope.From.length === 1) {
const from = mi.Envelope.From[0]
const name = from.Name || formatEmailAddress(from)
const datetime = mi.Envelope.Date.toLocaleDateString(undefined, {weekday: "short", year: "numeric", month: "short", day: "numeric"}) + ' at ' + mi.Envelope.Date.toLocaleTimeString()
onWroteLine = 'On ' + datetime + ', ' + name + ' wrote:\n'
}
body = '\n\n' + onWroteLine + body
}
} }
const subjectPrefix = forward ? 'Fwd:' : 'Re:' const subjectPrefix = forward ? 'Fwd:' : 'Re:'
let subject = mi.Envelope.Subject || '' let subject = mi.Envelope.Subject || ''