amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 16:35:10 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): improve reply and forward templates

Browse Source 
Fixes #5415
This commit is contained in:
Francis Lachapelle
2022-01-26 07:51:24 -05:00
parent 3eec819984
commit 929c6b1c0c
86 changed files with 1388 additions and 1358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Mailer/MessageEditorController.js
+3 -3
View File
@@ -382,7 +382,7 @@
if (this.composeType == "html") {
nl = '<br />';
reNl = '<br ?/>[ \n]?';
reNl = '<br ?/>(&nbsp;)?[ \n]?';
space = '&nbsp;';
} else {
nl = '\n';
@@ -409,8 +409,8 @@
if (!previousIdentity && signature.length > 0) {
// Must place signature at proper place
if (!this.isNew() && this.signaturePlacement == 'above') {
var quotedMessageIndex = this.message.editable.text.search(new RegExp(reNl + '.+?:( ?' + reNl + '){2}(> |<blockquote type="cite")'));
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")'));
if (quotedMessageIndex >= 0) {
this.message.editable.text =
this.message.editable.text.slice(0, quotedMessageIndex) +