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

Fixed Signature trailing whitespace (Closes #270)

Browse source
This commit is contained in:
RainLoop Team 2014-10-30 02:32:04 +04:00
parent 1423b88839
commit 5e8a57f6a3
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dev/Common/Utils.js
View file

@ -1240,17 +1240,6 @@
return sResult; return sResult;
}; };
/**
* @param {string} sPlain
* @return {string}
*/
Utils.convertPlainTextToHtml = function (sPlain)
{
return sPlain.toString()
.replace(/&/g, '&amp;').replace(/>/g, '&gt;').replace(/</g, '&lt;')
.replace(/\r/g, '').replace(/\n/g, '<br />');
};
Utils.draggeblePlace = function () Utils.draggeblePlace = function ()
{ {
return $('<div class="draggablePlace"><span class="text"></span>&nbsp;<i class="icon-copy icon-white visible-on-ctrl"></i><i class="icon-mail icon-white hidden-on-ctrl"></i></div>').appendTo('#rl-hidden'); return $('<div class="draggablePlace"><span class="text"></span>&nbsp;<i class="icon-copy icon-white visible-on-ctrl"></i><i class="icon-mail icon-white hidden-on-ctrl"></i></div>').appendTo('#rl-hidden');

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

@ -679,7 +679,7 @@
if (!bHtml) if (!bHtml)
{ {
sSignature = Utils.convertPlainTextToHtml(sSignature); sSignature = Utils.plainToHtml(sSignature, true);
} }
} }
@ -935,7 +935,7 @@
if (bSignatureToAll && '' !== sSignature) if (bSignatureToAll && '' !== sSignature)
{ {
sText = this.convertSignature(sSignature, '', sText = this.convertSignature(sSignature, '',
Utils.convertPlainTextToHtml(sText), sComposeType); Utils.plainToHtml(sText, true), sComposeType);
} }
this.editor(function (oEditor) { this.editor(function (oEditor) {