You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2017/10/30 15:13:47 UTC
[5/5] incubator-ponymail git commit: regen JS
regen JS
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/fb78e1bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/fb78e1bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/fb78e1bc
Branch: refs/heads/master
Commit: fb78e1bcbf46938114e86e09773eae305c303428
Parents: ca537e7
Author: Daniel Gruno <hu...@apache.org>
Authored: Mon Oct 30 16:13:25 2017 +0100
Committer: Daniel Gruno <hu...@apache.org>
Committed: Mon Oct 30 16:13:25 2017 +0100
----------------------------------------------------------------------
site/js/ponymail.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/fb78e1bc/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index d3c83cf..a9ff04a 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -1435,7 +1435,7 @@ function displayEmail(json, id, level) {
ebody = "\n" + ebody // add a newline at top
// If we're compacting quotes in the email, let's...do so with some fuzzy logic
if (prefs.compactQuotes == 'yes') {
- ebody = ebody.replace(/((?:\r?\n)((on .+ wrote:[\r\n]+)|(sent from my .+)|(>+[ \t]+[^\r\n]*\r?\n[^\n]*\n*)+)+)+/mgi, function(inner) {
+ ebody = ebody.replace(/((?:\r?\n)((on .+ wrote:[\r\n]+)|(sent from my .+)|(>+[ \t]*[^\r\n]*\r?\n[^\n]*\n*)+)+)+/mgi, function(inner) {
var rnd = (Math.random() * 100).toString()
inner = inner.replace(/>/g, ">")
var html = "<div class='bs-callout bs-callout-default' style='margin: 3px; padding: 2px;' id='parent_" + rnd + "'>" +