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: Allow for null email body
Date Tue, 16 May 2017 18:25:23 GMT
Repository: incubator-ponymail
Updated Branches:
  refs/heads/master 211ddde32 -> 767d8f8c1


Allow for null email body

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

Branch: refs/heads/master
Commit: 767d8f8c18d718270d61eb3eb2b27330696d1bfa
Parents: 211ddde
Author: Sebb <sebb@apache.org>
Authored: Tue May 16 19:25:18 2017 +0100
Committer: Sebb <sebb@apache.org>
Committed: Tue May 16 19:25:18 2017 +0100

----------------------------------------------------------------------
 site/js/dev/ponymail_listview_threaded.js | 4 ++--
 site/js/dev/ponymail_listview_tree.js     | 4 ++--
 site/js/ponymail.js                       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/767d8f8c/site/js/dev/ponymail_listview_threaded.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_listview_threaded.js b/site/js/dev/ponymail_listview_threaded.js
index 8a88b53..0937785 100644
--- a/site/js/dev/ponymail_listview_threaded.js
+++ b/site/js/dev/ponymail_listview_threaded.js
@@ -167,7 +167,7 @@ function loadList_threaded(mjson, limit, start, deep) {
                     "<div style='width: 64px; float: left;'>" +
                     "<img src='https://secure.gravatar.com/avatar/" + eml.gravatar + ".jpg?s=48&r=g&d=mm'/>"
+
                     "</div>" +
-                    "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+
(eml.body||json[i].body).replace(/</g, "&lt;") + "<br/>" +
+                    "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+
(eml.body||json[i].body||'').replace(/</g, "&lt;") + "<br/>" +
                     "<a class='label label-info' href='thread.html/" + (pm_config.shortLinks
? shortenID(eml.id) : eml.id) + "' style='font-size: 85%; padding: 2px;' onclick='latestEmailInThread
= " +
                     latest +
                     "; toggleEmails_threaded(" + i + "); latestEmailInThread = 0; return
false;'>Read more..</a>" +
@@ -179,7 +179,7 @@ function loadList_threaded(mjson, limit, start, deep) {
         else if (prefs.theme && prefs.theme == "compact") {
             var from = eml.from.replace(/<.*>/, "").length > 0 ? eml.from.replace(/<.*>/,
"") : eml.from.replace(/[<>]+/g, "")
             from = "<span class='from_name'>" + from.replace(/\"/g, "") + "</span>"
-            var sbody = (eml.body||json[i].body).replace(/</g, "&lt;") + "&nbsp;"
+            var sbody = (eml.body||json[i].body||'').replace(/</g, "&lt;") + "&nbsp;"
             
             nest += "<li class='list-group-item'>" +
                     

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/767d8f8c/site/js/dev/ponymail_listview_tree.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_listview_tree.js b/site/js/dev/ponymail_listview_tree.js
index 42cc013..b22bddd 100644
--- a/site/js/dev/ponymail_listview_tree.js
+++ b/site/js/dev/ponymail_listview_tree.js
@@ -167,7 +167,7 @@ function loadList_treeview(mjson, limit, start, deep) {
                     "<div style='width: 64px; float: left;'>" +
                     "<img src='https://secure.gravatar.com/avatar/" + eml.gravatar + ".jpg?s=48&r=g&d=mm'/>"
+
                     "</div>" +
-                    "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+
(eml.body||json[i].body).replace(/</g, "&lt;") + "<br/>" +
+                    "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+
(eml.body||json[i].body||'').replace(/</g, "&lt;") + "<br/>" +
                     "<a class='label label-info' href='thread.html/" + (pm_config.shortLinks
? shortenID(eml.id) : eml.id) + "' style='font-size: 85%; padding: 2px;' onclick='latestEmailInThread
= " +
                     latest +
                     "; toggleEmails_treeview(" + i + "); latestEmailInThread = 0; return
false;'>Read more..</a>" +
@@ -179,7 +179,7 @@ function loadList_treeview(mjson, limit, start, deep) {
         else if (prefs.theme && prefs.theme == "compact") {
             var from = eml.from.replace(/<.*>/, "").length > 0 ? eml.from.replace(/<.*>/,
"") : eml.from.replace(/[<>]+/g, "")
             from = "<span class='from_name'>" + from.replace(/\"/g, "") + "</span>"
-            var sbody = (eml.body||json[i].body).replace(/</g, "&lt;") + "&nbsp;"
+            var sbody = (eml.body||json[i].body||'').replace(/</g, "&lt;") + "&nbsp;"
             
             nest += "<li class='list-group-item'>" +
                     

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/767d8f8c/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index d2e7454..9aa2310 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -2725,7 +2725,7 @@ function loadList_threaded(mjson, limit, start, deep) {
                     "<div style='width: 64px; float: left;'>" +
                     "<img src='https://secure.gravatar.com/avatar/" + eml.gravatar + ".jpg?s=48&r=g&d=mm'/>"
+
                     "</div>" +
-                    "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+
(eml.body||json[i].body).replace(/</g, "&lt;") + "<br/>" +
+                    "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+
(eml.body||json[i].body||'').replace(/</g, "&lt;") + "<br/>" +
                     "<a class='label label-info' href='thread.html/" + (pm_config.shortLinks
? shortenID(eml.id) : eml.id) + "' style='font-size: 85%; padding: 2px;' onclick='latestEmailInThread
= " +
                     latest +
                     "; toggleEmails_threaded(" + i + "); latestEmailInThread = 0; return
false;'>Read more..</a>" +
@@ -2737,7 +2737,7 @@ function loadList_threaded(mjson, limit, start, deep) {
         else if (prefs.theme && prefs.theme == "compact") {
             var from = eml.from.replace(/<.*>/, "").length > 0 ? eml.from.replace(/<.*>/,
"") : eml.from.replace(/[<>]+/g, "")
             from = "<span class='from_name'>" + from.replace(/\"/g, "") + "</span>"
-            var sbody = (eml.body||json[i].body).replace(/</g, "&lt;") + "&nbsp;"
+            var sbody = (eml.body||json[i].body||'').replace(/</g, "&lt;") + "&nbsp;"
             
             nest += "<li class='list-group-item'>" +
                     
@@ -3008,7 +3008,7 @@ function loadList_treeview(mjson, limit, start, deep) {
                     "<div style='width: 64px; float: left;'>" +
                     "<img src='https://secure.gravatar.com/avatar/" + eml.gravatar + ".jpg?s=48&r=g&d=mm'/>"
+
                     "</div>" +
-                    "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+
(eml.body||json[i].body).replace(/</g, "&lt;") + "<br/>" +
+                    "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+
(eml.body||json[i].body||'').replace(/</g, "&lt;") + "<br/>" +
                     "<a class='label label-info' href='thread.html/" + (pm_config.shortLinks
? shortenID(eml.id) : eml.id) + "' style='font-size: 85%; padding: 2px;' onclick='latestEmailInThread
= " +
                     latest +
                     "; toggleEmails_treeview(" + i + "); latestEmailInThread = 0; return
false;'>Read more..</a>" +
@@ -3020,7 +3020,7 @@ function loadList_treeview(mjson, limit, start, deep) {
         else if (prefs.theme && prefs.theme == "compact") {
             var from = eml.from.replace(/<.*>/, "").length > 0 ? eml.from.replace(/<.*>/,
"") : eml.from.replace(/[<>]+/g, "")
             from = "<span class='from_name'>" + from.replace(/\"/g, "") + "</span>"
-            var sbody = (eml.body||json[i].body).replace(/</g, "&lt;") + "&nbsp;"
+            var sbody = (eml.body||json[i].body||'').replace(/</g, "&lt;") + "&nbsp;"
             
             nest += "<li class='list-group-item'>" +
                     


Mime
View raw message