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/02/18 13:29:11 UTC

[incubator-ponymail] branch master updated: Indentation in mail content (leading white-space) not shown

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 5e7b08a  Indentation in mail content (leading white-space) not shown
5e7b08a is described below

commit 5e7b08aeb5348c6c4c669d6fd168230436cfef01
Author: Sebb <se...@apache.org>
AuthorDate: Sun Feb 18 13:29:08 2018 +0000

    Indentation in mail content (leading white-space) not shown
    
    This fixes #432
---
 CHANGELOG.md                           | 3 +++
 site/js/dev/ponymail_email_displays.js | 4 ++--
 site/js/ponymail.js                    | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25d7622..5f97ef1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Changes in 0.11-SNAPSHOT
+- Bug: Indentation in mail content (leading white-space) not shown (#432)
+
 ## CHANGES in 0.10:
 - Bug: Use correct dependency order to fix OAuth login problem (#431)
 - Bug: HTTPS connections may fail with ES 6.x libraries (#425)
diff --git a/site/js/dev/ponymail_email_displays.js b/site/js/dev/ponymail_email_displays.js
index b440399..20e6f60 100644
--- a/site/js/dev/ponymail_email_displays.js
+++ b/site/js/dev/ponymail_email_displays.js
@@ -118,7 +118,7 @@ function displayEmail(json, id, level) {
             // Make the colored bar to the left that indicates nest level
             var bclass = "bubble-" + cols[parseInt(Math.random() * cols.length - 0.01)]
             // append body
-            thread.innerHTML += "<div class='" + bclass + "' style='padding: 8px; font-family: Hack; word-wrap: normal; white-space: pre-line; word-break: normal;'>" + ebody + '</div>'
+            thread.innerHTML += "<div class='" + bclass + "' style='padding: 8px; font-family: Hack; word-wrap: normal; white-space: pre-wrap; word-break: normal;'>" + ebody + '</div>'
             
             // Do we have attachments in this email?
             if (json.attachments && json.attachments.length > 0) {
@@ -194,7 +194,7 @@ function displayEmail(json, id, level) {
             if (json.private) {
                     pv = "background: none !important;"
                 }
-            thread.innerHTML += "<pre style='color: inherit; padding: 8px; font-family: Hack; word-wrap: normal; white-space: pre-line; word-break: normal; " + pv + "'>" + ebody + '</pre>'
+            thread.innerHTML += "<pre style='color: inherit; padding: 8px; font-family: Hack; word-wrap: normal; white-space: pre-wrap; word-break: normal; " + pv + "'>" + ebody + '</pre>'
             
             // Same as with social theme - "highlight new emails"
             if (thread.hasAttribute("meme")) {
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index 8f9cc00..69df530 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -1480,7 +1480,7 @@ function displayEmail(json, id, level) {
             // Make the colored bar to the left that indicates nest level
             var bclass = "bubble-" + cols[parseInt(Math.random() * cols.length - 0.01)]
             // append body
-            thread.innerHTML += "<div class='" + bclass + "' style='padding: 8px; font-family: Hack; word-wrap: normal; white-space: pre-line; word-break: normal;'>" + ebody + '</div>'
+            thread.innerHTML += "<div class='" + bclass + "' style='padding: 8px; font-family: Hack; word-wrap: normal; white-space: pre-wrap; word-break: normal;'>" + ebody + '</div>'
             
             // Do we have attachments in this email?
             if (json.attachments && json.attachments.length > 0) {
@@ -1558,7 +1558,7 @@ function displayEmail(json, id, level) {
             if (json.private) {
                     pv = "background: none !important;"
                 }
-            thread.innerHTML += "<pre style='color: inherit; padding: 8px; font-family: Hack; word-wrap: normal; white-space: pre-line; word-break: normal; " + pv + "'>" + ebody + '</pre>'
+            thread.innerHTML += "<pre style='color: inherit; padding: 8px; font-family: Hack; word-wrap: normal; white-space: pre-wrap; word-break: normal; " + pv + "'>" + ebody + '</pre>'
             
             // Same as with social theme - "highlight new emails"
             if (thread.hasAttribute("meme")) {

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