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

Improve plainToHtml function

Browse source 
Small code fixes
This commit is contained in:
RainLoop Team 2016-06-22 23:02:17 +03:00
parent 9fabd29ced
commit d8903c0680
2 changed files with 24 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

100
dev/Common/Utils.jsx
View file

@ -597,7 +597,9 @@ export function draggablePlace()
return $('<div class="draggablePlace">' + return $('<div class="draggablePlace">' +
'<span class="text"></span>&nbsp;' + '<span class="text"></span>&nbsp;' +
'<i class="icon-copy icon-white visible-on-ctrl"></i>' + '<i class="icon-copy icon-white visible-on-ctrl"></i>' +
'<i class="icon-mail icon-white hidden-on-ctrl"></i></div>').appendTo('#rl-hidden'); '<i class="icon-mail icon-white hidden-on-ctrl"></i>' +
'</div>'
).appendTo('#rl-hidden');
} }
export function defautOptionsAfterRender(domOption, item) export function defautOptionsAfterRender(domOption, item)
@ -727,68 +729,6 @@ body.plain blockquote blockquote blockquote {
} }
} }
/**
* @param {Object} viewModel
* @param {string} templateID
* @param {string} title
* @param {Function=} fCallback = null
*/
export function windowPopupKnockout(viewModel, templateID, title, fCallback = null)
{
const
win = window.open(''),
doc = win.document,
func = 'openerApplyBindingsUid' + fakeMd5(),
template = $('#' + templateID)
;
window[func] = () => {
if (win && doc && doc.body && template && template[0])
{
const body = $(doc.body);
$('#rl-content', body).html(template.html());
$('html', doc).addClass('external ' + $('html').attr('class'));
require('Common/Translator').i18nToNodes(body);
if (viewModel && $('#rl-content', body)[0])
{
ko.applyBindings(viewModel, $('#rl-content', body)[0]);
}
window[func] = null;
if (fCallback)
{
fCallback(win);
}
}
};
doc.open();
doc.write(trim(`
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="robots" content="noindex, nofollow, noodp" />
<title>${encodeHtml(title)}</title>
</head>
<body><div id="rl-content"></div></body>
</html>
`));
doc.close();
const script = doc.createElement('script');
script.type = 'text/javascript';
script.innerHTML = `if(window&&window.opener&&window.opener['${func}']){window.opener['${func}']();}`;
doc.getElementsByTagName('head')[0].appendChild(script);
}
/** /**
* @param {Function} fCallback * @param {Function} fCallback
* @param {?} koTrigger * @param {?} koTrigger
@ -882,13 +822,16 @@ export function findEmailAndLinks(html)
export function htmlToPlain(html) export function htmlToPlain(html)
{ {
let let
iPos = 0, pos = 0,
limit = 0,
iP1 = 0, iP1 = 0,
iP2 = 0, iP2 = 0,
iP3 = 0, iP3 = 0,
iLimit = 0,
text = '', text = ''
;
const
convertBlockquote = (blockquoteText) => { convertBlockquote = (blockquoteText) => {
blockquoteText = '> ' + trim(blockquoteText).replace(/\n/gm, '\n> '); blockquoteText = '> ' + trim(blockquoteText).replace(/\n/gm, '\n> ');
@ -915,10 +858,7 @@ export function htmlToPlain(html)
convertPre = (...args) => { convertPre = (...args) => {
return (args && 1 < args.length) ? return (args && 1 < args.length) ?
args[1].toString() args[1].toString().replace(/[\n]/gm, '<br />').replace(/[\r]/gm, '') : '';
.replace(/[\n]/gm, '<br />')
.replace(/[\r]/gm, '')
: '';
}, },
fixAttibuteValue = (...args) => { fixAttibuteValue = (...args) => {
@ -968,13 +908,13 @@ export function htmlToPlain(html)
text = splitPlainText(trim(text)); text = splitPlainText(trim(text));
iPos = 0; pos = 0;
iLimit = 800; limit = 800;
while (0 < iLimit) while (0 < limit)
{ {
iLimit--; limit--;
iP1 = text.indexOf('__bq__start__', iPos); iP1 = text.indexOf('__bq__start__', pos);
if (-1 < iP1) if (-1 < iP1)
{ {
iP2 = text.indexOf('__bq__start__', iP1 + 5); iP2 = text.indexOf('__bq__start__', iP1 + 5);
@ -986,15 +926,15 @@ export function htmlToPlain(html)
convertBlockquote(text.substring(iP1 + 13, iP3)) + convertBlockquote(text.substring(iP1 + 13, iP3)) +
text.substring(iP3 + 11); text.substring(iP3 + 11);
iPos = 0; pos = 0;
} }
else if (-1 < iP2 && iP2 < iP3) else if (-1 < iP2 && iP2 < iP3)
{ {
iPos = iP2 - 1; pos = iP2 - 1;
} }
else else
{ {
iPos = 0; pos = 0;
} }
} }
else else
@ -1020,6 +960,10 @@ export function plainToHtml(plain, findEmailAndLinksInText = false)
{ {
plain = plain.toString().replace(/\r/g, ''); plain = plain.toString().replace(/\r/g, '');
plain = plain.replace(/^>[> ]>+/gm, ([match]) => {
return match ? match.replace(/[ ]+/g, '') : match;
});
let let
bIn = false, bIn = false,
bDo = true, bDo = true,

3
rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
View file

@ -1354,7 +1354,8 @@ class HtmlUtils
$sText = \MailSo\Base\LinkFinder::NewInstance() $sText = \MailSo\Base\LinkFinder::NewInstance()
->Text($sText) ->Text($sText)
->UseDefaultWrappers($bLinksWithTargetBlank) ->UseDefaultWrappers($bLinksWithTargetBlank)
->CompileText(); ->CompileText()
;
$sText = \str_replace("\r", '', $sText); $sText = \str_replace("\r", '', $sText);