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

Pgp improvements

Browse source
This commit is contained in:
RainLoop Team 2015-07-29 21:21:24 +04:00
parent 3849fd02b4
commit 5123841540
18 changed files with 397 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dev/Common/Utils.js
View file

@ -852,7 +852,11 @@
},
convertPre = function () {
return (arguments && 1 < arguments.length) ? arguments[1].toString().replace(/[\n]/gm, '<br />') : '';
return (arguments && 1 < arguments.length) ?
arguments[1].toString()
.replace(/[\n]/gm, '<br />')
.replace(/[\r]/gm, '')
: '';
},
fixAttibuteValue = function () {
@ -868,7 +872,7 @@
sText = sHtml
.replace(/\u0002([\s\S]*)\u0002/gm, '\u200C$1\u200C')
.replace(/<p[^>]*><\/p>/gi, '')
.replace(/<pre[^>]*>([\s\S\r\n]*)<\/pre>/gmi, convertPre)
.replace(/<pre[^>]*>([\s\S\r\n\t]*)<\/pre>/gmi, convertPre)
.replace(/[\s]+/gm, ' ')
.replace(/((?:href|data)\s?=\s?)("[^"]+?"|'[^']+?')/gmi, fixAttibuteValue)
.replace(/<br[^>]*>/gmi, '\n')