You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2018/03/02 19:55:44 UTC

[incubator-ponymail] branch master updated: Oops forgot to update source in 3cc594f

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail.git


The following commit(s) were added to refs/heads/master by this push:
     new 2eb9692  Oops forgot to update source in 3cc594f
2eb9692 is described below

commit 2eb96922189b3e7b389173952499e3cee5388294
Author: Sebb <se...@apache.org>
AuthorDate: Fri Mar 2 19:55:42 2018 +0000

    Oops forgot to update source in 3cc594f
---
 site/js/dev/ponymail_email_displays.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/js/dev/ponymail_email_displays.js b/site/js/dev/ponymail_email_displays.js
index 20e6f60..c70c8aa 100644
--- a/site/js/dev/ponymail_email_displays.js
+++ b/site/js/dev/ponymail_email_displays.js
@@ -73,7 +73,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)+)+)+/mgi, function(inner) {
                 var rnd = (Math.random() * 100).toString()
                 inner = inner.replace(/>/g, "&gt;")
                 var html = "<div class='bs-callout bs-callout-default' style='margin: 3px; padding: 2px;' id='parent_" + rnd + "'>" +

-- 
To stop receiving notification emails like this one, please contact
sebb@apache.org.