ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject [4/5] incubator-ponymail git commit: space after a > can be optional
Date Mon, 30 Oct 2017 15:13:46 GMT
space after a > can be optional

we don't want to display a single > if it's a quote of an empty line.
it can get noisy


Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/ca537e73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/ca537e73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/ca537e73

Branch: refs/heads/master
Commit: ca537e733b6b7096b83ca105a625e5ad1abda110
Parents: 724837d
Author: Daniel Gruno <humbedooh@apache.org>
Authored: Mon Oct 30 16:13:10 2017 +0100
Committer: Daniel Gruno <humbedooh@apache.org>
Committed: Mon Oct 30 16:13:10 2017 +0100

----------------------------------------------------------------------
 site/js/dev/ponymail_email_displays.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/ca537e73/site/js/dev/ponymail_email_displays.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_email_displays.js b/site/js/dev/ponymail_email_displays.js
index 913f453..b440399 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[^\n]*\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 + "'>" +


Mime
View raw message