fix(mail(js)): respect signature placement when switching identity
parent
5db000aa26
commit
089935297c
|
@ -49,6 +49,7 @@
|
||||||
|
|
||||||
this.composeType = Preferences.defaults.SOGoMailComposeMessageType;
|
this.composeType = Preferences.defaults.SOGoMailComposeMessageType;
|
||||||
|
|
||||||
|
this.signaturePlacement = Preferences.defaults.SOGoMailSignaturePlacement;
|
||||||
this.replyPlacement = Preferences.defaults.SOGoMailReplyPlacement;
|
this.replyPlacement = Preferences.defaults.SOGoMailReplyPlacement;
|
||||||
if (this.message.origin && this.message.origin.action == 'forward') {
|
if (this.message.origin && this.message.origin.action == 'forward') {
|
||||||
// For forwards, place caret at top unconditionally
|
// For forwards, place caret at top unconditionally
|
||||||
|
@ -387,7 +388,7 @@
|
||||||
|
|
||||||
if (!previousIdentity && signature.length > 0) {
|
if (!previousIdentity && signature.length > 0) {
|
||||||
// Must place signature at proper place
|
// 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")'));
|
var quotedMessageIndex = this.message.editable.text.search(new RegExp(nl + '.+?:( ?' + nl + '){2}(> |<blockquote type="cite")'));
|
||||||
if (quotedMessageIndex >= 0) {
|
if (quotedMessageIndex >= 0) {
|
||||||
this.message.editable.text =
|
this.message.editable.text =
|
||||||
|
|
Loading…
Reference in New Issue