ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject incubator-ponymail git commit: Bug: GUI can hide reply text when analysing quoted text
Date Sat, 09 Dec 2017 14:59:46 GMT
Repository: incubator-ponymail
Updated Branches:
  refs/heads/master 8ef2678dd -> 3cc594ff2


Bug: GUI can hide reply text when analysing quoted text

This fixes #421

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

Branch: refs/heads/master
Commit: 3cc594ff2c8ed4786ad4e5dfae5c7365e3e49bbd
Parents: 8ef2678
Author: Sebb <sebb@apache.org>
Authored: Sat Dec 9 14:59:32 2017 +0000
Committer: Sebb <sebb@apache.org>
Committed: Sat Dec 9 14:59:32 2017 +0000

----------------------------------------------------------------------
 CHANGELOG.md        | 1 +
 site/js/ponymail.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/3cc594ff/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b69597e..f79f9e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## CHANGES in 0.10:
+- Bug: GUI can hide reply text when analysing quoted text (#421)
 - mbox.lua output filename does not match ISO standard (#420)
 - Added empty line quotes to JS compaction feature
 - Changed default theme to 'compact'

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/3cc594ff/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index a9ff04a..84fa8eb 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)+)+)+/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