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

Resolve #356

Browse source
This commit is contained in:
the-djmaze 2022-04-29 23:41:00 +02:00
parent 08173c7663
commit bde9835d5d
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dev/External/SquireUI.js vendored
View file

@ -451,7 +451,6 @@ class SquireUI
} else { } else {
const squire = this.squire, const squire = this.squire,
root = squire.getRoot(), root = squire.getRoot(),
range = squire.getSelection(),
br = createElement('br'), br = createElement('br'),
div = createElement('div'); div = createElement('div');
div.className = 'rl-signature'; div.className = 'rl-signature';
@ -461,9 +460,7 @@ class SquireUI
// Move cursor above signature // Move cursor above signature
div.before(br); div.before(br);
div.before(br.cloneNode()); div.before(br.cloneNode());
range.setStart(br, 0); this.setCursorAt(br);
range.setEnd(br, 0);
squire.setSelection( range );
} }
this._prev_txt_sig = signature; this._prev_txt_sig = signature;
} catch (e) { } catch (e) {
@ -478,7 +475,18 @@ class SquireUI
setData(html) { setData(html) {
// this.plain.value = html; // this.plain.value = html;
this.squire.setHTML(trimLines(html)); const squire = this.squire,
root = squire.getRoot();
squire.setHTML(trimLines(html));
this.setCursorAt(root);
}
setCursorAt(node) {
const squire = this.squire,
range = squire.getSelection();
range.setStart(node, 0);
range.setEnd(node, 0);
squire.setSelection( range );
} }
focus() { focus() {

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

@ -1037,17 +1037,17 @@ export class ComposePopupView extends AbstractViewPopup {
case ComposeType.Reply: case ComposeType.Reply:
case ComposeType.ReplyAll: case ComposeType.ReplyAll:
sFrom = message.fromToLine(false, true); sFrom = message.fromToLine(false, true);
sText = '<div><p>' + i18n('COMPOSE/REPLY_MESSAGE_TITLE', { DATETIME: sDate, EMAIL: sFrom }) sText = '<br><br><p>' + i18n('COMPOSE/REPLY_MESSAGE_TITLE', { DATETIME: sDate, EMAIL: sFrom })
+ ':</p><blockquote>' + ':</p><blockquote>'
+ sText.replace(/<img[^>]+>/g, '').replace(/<a\s[^>]+><\/a>/g, '').trim() + sText.replace(/<img[^>]+>/g, '').replace(/<a\s[^>]+><\/a>/g, '').trim()
+ '</blockquote></div>'; + '</blockquote>';
break; break;
case ComposeType.Forward: case ComposeType.Forward:
sFrom = message.fromToLine(false, true); sFrom = message.fromToLine(false, true);
sTo = message.toToLine(false, true); sTo = message.toToLine(false, true);
sCc = message.ccToLine(false, true); sCc = message.ccToLine(false, true);
sText = '<div><p>' + i18n('COMPOSE/FORWARD_MESSAGE_TOP_TITLE') + '</p>' sText = '<br><br><p>' + i18n('COMPOSE/FORWARD_MESSAGE_TOP_TITLE') + '</p><div>'
+ i18n('GLOBAL/FROM') + ': ' + sFrom + i18n('GLOBAL/FROM') + ': ' + sFrom
+ '<br>' + '<br>'
+ i18n('GLOBAL/TO') + ': ' + sTo + i18n('GLOBAL/TO') + ': ' + sTo