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 2017/01/18 11:21:04 UTC
incubator-ponymail git commit: flat view mode does not show first
line of body (#198)
Repository: incubator-ponymail
Updated Branches:
refs/heads/master b3391c52a -> 5dce208fe
flat view mode does not show first line of body (#198)
Fix up Javascript so it can work against older stats.lua
which returned the body in the threads array instead
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/5dce208f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/5dce208f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/5dce208f
Branch: refs/heads/master
Commit: 5dce208fe6824d72305e72614a4df7ab31dc558c
Parents: b3391c5
Author: Sebb <se...@apache.org>
Authored: Wed Jan 18 11:19:59 2017 +0000
Committer: Sebb <se...@apache.org>
Committed: Wed Jan 18 11:19:59 2017 +0000
----------------------------------------------------------------------
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/5dce208f/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 457a9ba..f86166d 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.replace(/</g, "<") + "<br/>" +
+ "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+ (eml.body||json[i].body).replace(/</g, "<") + "<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.replace(/</g, "<") + " "
+ var sbody = (eml.body||json[i].body).replace(/</g, "<") + " "
nest += "<li class='list-group-item'>" +
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/5dce208f/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 87a539f..4ca1047 100644
--- a/site/js/dev/ponymail_listview_tree.js
+++ b/site/js/dev/ponymail_listview_tree.js
@@ -137,7 +137,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.replace(/</g, "<") + "<br/>" +
+ "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+ (eml.body||json[i].body).replace(/</g, "<") + "<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>" +
@@ -147,7 +147,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.replace(/</g, "<") + " "
+ var sbody = (eml.body||json[i].body).replace(/</g, "<") + " "
nest += "<li class='list-group-item'>" +
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/5dce208f/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index b1e8040..341536e 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.replace(/</g, "<") + "<br/>" +
+ "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+ (eml.body||json[i].body).replace(/</g, "<") + "<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.replace(/</g, "<") + " "
+ var sbody = (eml.body||json[i].body).replace(/</g, "<") + " "
nest += "<li class='list-group-item'>" +
@@ -2977,7 +2977,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.replace(/</g, "<") + "<br/>" +
+ "<div class='bubble-topic' style='float: left; width:calc(100% - 70px);'>"+ (eml.body||json[i].body).replace(/</g, "<") + "<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>" +
@@ -2987,7 +2987,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.replace(/</g, "<") + " "
+ var sbody = (eml.body||json[i].body).replace(/</g, "<") + " "
nest += "<li class='list-group-item'>" +