Skip to content

Initial stab at fixing #426 #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Humbedooh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Initial stab at fixing #426 #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f893830
If we hit >12 levels of nesting, start cutting padding
Humbedooh Jan 7, 2018
ec2e136
Regenerate JS
Humbedooh Jan 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions site/js/dev/ponymail_assign_vars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ var pending_urls = {} // URL list for GetAsync's support functions (such as the
var pb_refresh = 0
var treeview_guard = {}
var mbox_month = null
var max_nesting = 12

var URL_BASE = pm_config.URLBase ? pm_config.URLBase.replace(/\/+/g, "/") : ""

Expand Down
16 changes: 12 additions & 4 deletions site/js/dev/ponymail_email_displays.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,18 @@ function displayEmail(json, id, level) {
}
// Default theme
else {
thread.setAttribute("class", "reply bs-callout bs-callout-" + cols[parseInt(Math.random() * cols.length - 0.01)])
tclass = "reply bs-callout bs-callout-" + cols[parseInt(Math.random() * cols.length - 0.01)]
// If we hit max_nesting levels, discard nesting display further down.
// Otherwise, we risk squeezing it into oblivion.
thread.style.padding = "5px"
thread.style.fontFamily = "Hack"

if (level >= max_nesting) {
tclass = "reply" // No bs-callout if we nest too deep.
thread.style.paddingLeft = "0px"; // remove padding, left and right
thread.style.paddingRight = "0px";
}
thread.setAttribute("class", tclass)
thread.style.background = estyle
thread.style.marginTop = "30px"
thread.innerHTML += ' &nbsp; <label class="label label-success" onclick="compose(\'' + json.mid + '\');" style="cursor: pointer; float: right; margin-left: 10px;">Reply</label>'
Expand All @@ -156,9 +167,6 @@ function displayEmail(json, id, level) {


thread.innerHTML += "<br/>"
//thread.style.border = "1px dotted #666"
thread.style.padding = "5px"
thread.style.fontFamily = "Hack"

var fields = ['From', 'To', 'CC', 'Subject', 'Date']
for (var i in fields) {
Expand Down
17 changes: 13 additions & 4 deletions site/js/ponymail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ var pending_urls = {} // URL list for GetAsync's support functions (such as the
var pb_refresh = 0
var treeview_guard = {}
var mbox_month = null
var max_nesting = 12

var URL_BASE = pm_config.URLBase ? pm_config.URLBase.replace(/\/+/g, "/") : ""

Expand Down Expand Up @@ -1506,7 +1507,18 @@ function displayEmail(json, id, level) {
}
// Default theme
else {
thread.setAttribute("class", "reply bs-callout bs-callout-" + cols[parseInt(Math.random() * cols.length - 0.01)])
tclass = "reply bs-callout bs-callout-" + cols[parseInt(Math.random() * cols.length - 0.01)]
// If we hit max_nesting levels, discard nesting display further down.
// Otherwise, we risk squeezing it into oblivion.
thread.style.padding = "5px"
thread.style.fontFamily = "Hack"

if (level >= max_nesting) {
tclass = "reply" // No bs-callout if we nest too deep.
thread.style.paddingLeft = "0px"; // remove padding, left and right
thread.style.paddingRight = "0px";
}
thread.setAttribute("class", tclass)
thread.style.background = estyle
thread.style.marginTop = "30px"
thread.innerHTML += ' &nbsp; <label class="label label-success" onclick="compose(\'' + json.mid + '\');" style="cursor: pointer; float: right; margin-left: 10px;">Reply</label>'
Expand All @@ -1518,9 +1530,6 @@ function displayEmail(json, id, level) {


thread.innerHTML += "<br/>"
//thread.style.border = "1px dotted #666"
thread.style.padding = "5px"
thread.style.fontFamily = "Hack"

var fields = ['From', 'To', 'CC', 'Subject', 'Date']
for (var i in fields) {
Expand Down