amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-30 01:09:29 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail(js)): improve signature replacement when switching identities

Browse Source
This commit is contained in:
Francis Lachapelle
2022-03-01 13:16:19 -05:00
parent 7f31686bc5
commit d90e29ed63
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
UI/WebServerResources/js/Mailer/MessageEditorController.js
View File

@@ -380,7 +380,7 @@
};
this.setFromIdentity = function (identity) {
var node, children, nl, reNl, space, signature, previousIdentity;
var node, children, nl, reNl, nlNb, space, signature, previousIdentity;
if (identity && identity.full)
this.message.editable.from = identity.full;
@@ -397,14 +397,20 @@
space = ' ';
}
// One newline above signature when placed at the bottom, two newlines when placed at the top (see HTML templates)
if (this.signaturePlacement == 'above')
nlNb = 2;
else
nlNb = 1;
if (identity && identity.signature)
signature = nl + nl + '--' + space + nl + identity.signature;
signature = nl.repeat(nlNb) + '--' + space + nl + identity.signature;
else
signature = '';
previousIdentity = _.find(this.identities, function (currentIdentity, index) {
if (currentIdentity.signature) {
var currentSignature = new RegExp(reNl + reNl + '--' + space + reNl +
var currentSignature = new RegExp('(' + reNl + '){' + nlNb + '}--' + space + reNl +
currentIdentity.signature.replace(/[-\[\]{}()*+?.,\\^$|#\s]/g, '\\$&'));
if (vm.message.editable.text.search(currentSignature) >= 0) {
vm.message.editable.text = vm.message.editable.text.replace(currentSignature, signature);
@@ -417,7 +423,7 @@
if (!previousIdentity && signature.length > 0) {
// Must place signature at proper place
if (!this.isNew() && this.replyPlacement == 'above' && this.signaturePlacement == 'above') {
var quotedMessageIndex = this.message.editable.text.search(new RegExp(reNl + '.+?:( ?' + reNl + '){1,2}(> |<blockquote type="cite")'));
var quotedMessageIndex = this.message.editable.text.search(new RegExp(reNl + '.+?:( ?' + reNl + '){' + nlNb + '}(> |<blockquote type="cite")'));
if (quotedMessageIndex >= 0) {
this.message.editable.text =
this.message.editable.text.slice(0, quotedMessageIndex) +