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

Signature builder small changes

Browse source
This commit is contained in:
RainLoop Team 2015-02-16 05:21:18 +04:00
parent 5584c5037f
commit 4c6fd9cdd1
6 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
View file

@ -2,6 +2,8 @@
<div class="form-horizontal">
<div class="legend">
<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/LEGEND_ACCOUNTS"></span>
&nbsp;&nbsp;&nbsp;
<i class="icon-spinner animated" style="margin-top: 5px" data-bind="visible: accounts.loading"></i>
</div>
</div>
<a class="btn" data-bind="click: addNewAccount">
@ -9,11 +11,9 @@
&nbsp;&nbsp;
<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span>
</a>
<div class="process-place" data-bind="style: {'visibility': visibility }">
<i class="icon-spinner animated"></i>
&nbsp;&nbsp;
<span data-bind="text: processText"></span>
</div>
<br />
<br />
<br />
<table class="table table-hover list-table accounts-list" data-bind="i18nUpdate: accounts">
<colgroup>
<col />

7
rainloop/v/0.0.0/static/ckeditor/plugins/signature/plugin.js
View file

@ -2,13 +2,16 @@
rl_signature_replacer = function (editor, sText, sSignature, bHtml, bInsertBefore)
{
var
bEmptyText = '' === $.trim(sText),
sTextWithoutSignature = sText
.replace(/\u0002\u0002[\s\S]*\u0003\u0003/gm, '')
.replace(/\u0004\u0004[\s\S]*\u0005\u0005/gm, ''),
bEmptyText = '' === $.trim(sTextWithoutSignature),
sNewLine = (bHtml ? '<br />' : "\n")
;
if (!bEmptyText && bHtml)
{
bEmptyText = '' !== $.trim(editor.__plainUtils.htmlToPlain(sText));
bEmptyText = '' !== $.trim(editor.__plainUtils.htmlToPlain(sTextWithoutSignature));
}
if (!/\u0002\u0002/gm.test(sText))