LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(mail(js)): respect signature placement when switching identity

pull/283/head
Francis Lachapelle 2020-07-03 17:41:47 -04:00
parent 5db000aa26
commit 089935297c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@
this.composeType = Preferences.defaults.SOGoMailComposeMessageType;
this.signaturePlacement = Preferences.defaults.SOGoMailSignaturePlacement;
this.replyPlacement = Preferences.defaults.SOGoMailReplyPlacement;
if (this.message.origin && this.message.origin.action == 'forward') {
// For forwards, place caret at top unconditionally
@ -387,7 +388,7 @@
if (!previousIdentity && signature.length > 0) {
// Must place signature at proper place
if (!this.isNew() && this.replyPlacement == 'above') {
if (!this.isNew() && this.signaturePlacement == 'above') {
var quotedMessageIndex = this.message.editable.text.search(new RegExp(nl + '.+?:( ?' + nl + '){2}(> |<blockquote type="cite")'));
if (quotedMessageIndex >= 0) {
this.message.editable.text =