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

Fix signature adding

Browse source
This commit is contained in:
RainLoop Team 2016-08-31 00:31:51 +03:00
parent b8e0303fc4
commit 6b1fd1239f
3 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dev/Common/HtmlEditor.js
View file

@ -58,10 +58,23 @@ class HtmlEditor
return this.editor ? 'wysiwyg' === this.editor.mode : false;
}
/**
* @returns {void}
*/
clearCachedSignature() {
if (this.editor)
{
this.editor.execCommand('insertSignature', {
clearCache: true
});
}
}
/**
* @param {string} signature
* @param {bool} html
* @param {bool} insertBefore
* @returns {void}
*/
setSignature(signature, html, insertBefore) {
if (this.editor)
@ -163,6 +176,8 @@ class HtmlEditor
setHtml(html, focus) {
if (this.editor && this.__inited)
{
this.clearCachedSignature();
this.modeToggle(true);
html = html.replace(/<p[^>]*><\/p>/ig, '');
@ -193,6 +208,8 @@ class HtmlEditor
setPlain(plain, focus) {
if (this.editor && this.__inited)
{
this.clearCachedSignature();
this.modeToggle(false);
if ('plain' === this.editor.mode && this.editor.plugins.plain && this.editor.__plain)
{

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

@ -869,13 +869,13 @@ class ComposePopupView extends AbstractViewNext
return signature;
}
setSignatureFromIdentity(oIdentity) {
if (oIdentity)
setSignatureFromIdentity(identity) {
if (identity)
{
this.editor((editor) => {
let
isHtml = false,
signature = oIdentity.signature();
signature = identity.signature();
if ('' !== signature)
{
@ -886,7 +886,7 @@ class ComposePopupView extends AbstractViewNext
}
}
editor.setSignature(this.converSignature(signature), isHtml, !!oIdentity.signatureInsertBefore());
editor.setSignature(this.converSignature(signature), isHtml, !!identity.signatureInsertBefore());
});
}
}