Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-02 22:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add some signature improvements (#1238)

Browse source
This commit is contained in:
RainLoop Team 2016-10-27 00:25:15 +03:00
parent ca4897038a
commit 9d60dd0786
5 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
vendors/ckeditor-plugins/signature/plugin.js vendored
View file

@ -3,7 +3,7 @@
'use strict';
var rl_signature_replacer = function(editor, text, signature, isHtml, insertBefore) {
var rl_signature_replacer = function(editor, text, signature, isHtml, insertBefore, isFirst) {
var
skipInsert = false,
@ -60,7 +60,15 @@
if (!skipInsert)
{
signature = insertBefore ? signature + (isEmptyText ? '' : newLine) : (isEmptyText ? '' : newLine) + signature;
if (isEmptyText)
{
signature = newLine + newLine + signature;
}
else
{
signature = insertBefore ? signature + newLine + newLine : newLine + newLine + signature;
}
if (isHtml)
{
signature = '<signature>' + signature + '</signature>';
@ -93,6 +101,7 @@
var
bIsHtml = false,
bIsFirst = false,
bInsertBefore = false,
sSignature = '',
sResultSignature = '';
@ -100,6 +109,7 @@
if (cfg)
{
bIsHtml = undefined === cfg.isHtml ? false : !!cfg.isHtml;
bIsFirst = undefined === cfg.isFirst ? false : !!cfg.isFirst;
bInsertBefore = undefined === cfg.insertBefore ? false : !!cfg.insertBefore;
sSignature = undefined === cfg.signature ? '' : cfg.signature;
}
@ -119,7 +129,7 @@
}
editor.__plain.setRawData(
rl_signature_replacer(editor, editor.__plain.getRawData(), sResultSignature, false, bInsertBefore));
rl_signature_replacer(editor, editor.__plain.getRawData(), sResultSignature, false, bInsertBefore, bIsFirst));
}
else
@ -133,7 +143,7 @@
}
editor.setData(
rl_signature_replacer(editor, editor.getData(), sResultSignature, true, bInsertBefore));
rl_signature_replacer(editor, editor.getData(), sResultSignature, true, bInsertBefore, bIsFirst));
}
}
catch (e) {}