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/09 10:52:24 UTC
incubator-ponymail git commit: Always use Javascript conditional
blocks
Repository: incubator-ponymail
Updated Branches:
refs/heads/master 87769693a -> f5f29a042
Always use Javascript conditional blocks
This fixes #333
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/f5f29a04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/f5f29a04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/f5f29a04
Branch: refs/heads/master
Commit: f5f29a04215b8baa6f59e733379c184139fe00fe
Parents: 8776969
Author: Sebb <se...@apache.org>
Authored: Mon Jan 9 10:52:12 2017 +0000
Committer: Sebb <se...@apache.org>
Committed: Mon Jan 9 10:52:12 2017 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
site/js/dev/ponymail_composer.js | 4 ++-
site/js/dev/ponymail_dom_helpers.js | 4 ++-
site/js/dev/ponymail_email_displays.js | 8 +++--
site/js/dev/ponymail_listview_tree.js | 8 +++--
site/js/dev/ponymail_ngrams.js | 16 +++++++---
site/js/dev/ponymail_search.js | 8 +++--
site/js/ponymail.js | 48 +++++++++++++++++++++--------
8 files changed, 73 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f5f29a04/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5c3862..2ecdb22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -116,6 +116,7 @@
- stats.lua - cache causes inconsistent output when quick is used (#118)
- does not show mixed private/public lists unless logged in (#70)
- inconsistent error reporting for invalid mailing lists (#112)
+- Always use Javascript conditional blocks (#333)
## CHANGES in 0.9b:
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f5f29a04/site/js/dev/ponymail_composer.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_composer.js b/site/js/dev/ponymail_composer.js
index 3077bad..7e4caf4 100644
--- a/site/js/dev/ponymail_composer.js
+++ b/site/js/dev/ponymail_composer.js
@@ -42,7 +42,9 @@ function saveDraft() {
function hideComposer(evt, nosave) {
var es = evt ? (evt.target || evt.srcElement) : null;
if (!es || !es.getAttribute || !es.getAttribute("class") || (es.nodeName != 'A' && es.getAttribute("class").search(/label/) == -1)) {
- if (!nosave) saveDraft()
+ if (!nosave) {
+ saveDraft()
+ }
document.getElementById('splash').style.display = "none"
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f5f29a04/site/js/dev/ponymail_dom_helpers.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_dom_helpers.js b/site/js/dev/ponymail_dom_helpers.js
index 5947859..aa238f5 100644
--- a/site/js/dev/ponymail_dom_helpers.js
+++ b/site/js/dev/ponymail_dom_helpers.js
@@ -266,7 +266,9 @@ function openEmail() {
kiddos = []
traverseThread(document.body, '(thread|helper)_', 'DIV')
for (var i in kiddos) {
- if (kiddos[i].style.display == 'block') return true
+ if (kiddos[i].style.display == 'block') {
+ return true
+ }
}
return false
}
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f5f29a04/site/js/dev/ponymail_email_displays.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_email_displays.js b/site/js/dev/ponymail_email_displays.js
index f74a1ba..1267c99 100644
--- a/site/js/dev/ponymail_email_displays.js
+++ b/site/js/dev/ponymail_email_displays.js
@@ -401,11 +401,15 @@ function toggleEmails_threaded(id, close, toverride, threadobj) {
helper.style.display = 'none'
prefs.groupBy = 'thread' // hack for now
thread.innerHTML = ""
- if (document.getElementById('bubble_' + id)) document.getElementById('bubble_' + id).style.display = 'block'
+ if (document.getElementById('bubble_' + id)) {
+ document.getElementById('bubble_' + id).style.display = 'block'
+ }
return
} else {
helper.style.display = 'block'
- if (document.getElementById('bubble_' + id)) document.getElementById('bubble_' + id).style.display = 'none'
+ if (document.getElementById('bubble_' + id)) {
+ document.getElementById('bubble_' + id).style.display = 'none'
+ }
}
if (!open_emails[id]) {
open_emails[id] = true
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f5f29a04/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 0cab9b9..a3792ce 100644
--- a/site/js/dev/ponymail_listview_tree.js
+++ b/site/js/dev/ponymail_listview_tree.js
@@ -433,11 +433,15 @@ function toggleEmails_treeview(id, close, toverride) {
helper.style.display = 'none'
prefs.groupBy = 'treeview' // hack for now
thread.innerHTML = ""
- if (document.getElementById('bubble_' + id)) document.getElementById('bubble_' + id).style.display = 'block'
+ if (document.getElementById('bubble_' + id)) {
+ document.getElementById('bubble_' + id).style.display = 'block'
+ }
return
} else {
helper.style.display = 'block'
- if (document.getElementById('bubble_' + id)) document.getElementById('bubble_' + id).style.display = 'none'
+ if (document.getElementById('bubble_' + id)) {
+ document.getElementById('bubble_' + id).style.display = 'none'
+ }
}
if (!open_emails[id]) {
open_emails[id] = true
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f5f29a04/site/js/dev/ponymail_ngrams.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_ngrams.js b/site/js/dev/ponymail_ngrams.js
index 3ad5c77..a35a131 100644
--- a/site/js/dev/ponymail_ngrams.js
+++ b/site/js/dev/ponymail_ngrams.js
@@ -160,10 +160,18 @@ function makeNgramURL() {
var list = document.getElementById('listname').value
var timespan = document.getElementById('timespan').getAttribute("data")
var qs = []
- if (document.getElementById('stack').checked) qs.push("stack")
- if (document.getElementById('topics').checked) qs.push("topics")
- if (document.getElementById('avg').checked) qs.push("avg")
- if (document.getElementById('plaw').checked) qs.push("plaw")
+ if (document.getElementById('stack').checked) {
+ qs.push("stack")
+ }
+ if (document.getElementById('topics').checked) {
+ qs.push("topics")
+ }
+ if (document.getElementById('avg').checked) {
+ qs.push("avg")
+ }
+ if (document.getElementById('plaw').checked) {
+ qs.push("plaw")
+ }
for (n = 0; n < 20; n++) {
if (document.getElementById('query' + n) && document.getElementById('query' + n).value.length > 0) {
qs.push(document.getElementById('query' + n).value)
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f5f29a04/site/js/dev/ponymail_search.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_search.js b/site/js/dev/ponymail_search.js
index 66df366..7db84f3 100644
--- a/site/js/dev/ponymail_search.js
+++ b/site/js/dev/ponymail_search.js
@@ -58,7 +58,9 @@ function toggleEmail(year, mo, nopush) {
xmo = '0' + xmo
}
// push history state, fetch the data from API
- if (!nopush) window.history.pushState({}, "", "list.html?" + xlist + ":" + year + '-' + xmo);
+ if (!nopush) {
+ window.history.pushState({}, "", "list.html?" + xlist + ":" + year + '-' + xmo);
+ }
GetAsync("/api/stats.lua?list=" + listname + "&domain=" + domain + "&s=" + s + "&e=" + e, null, buildPage)
// set list title to list and year/month
@@ -101,7 +103,9 @@ function search(q, d, nopush, all) {
clearCalendarHover()
// As usual, push new history state
- if (!nopush) window.history.pushState({}, "", "list.html?" + listname + "@" + domain + ":" + d + ":" + encodeURIComponent(q));
+ if (!nopush) {
+ window.history.pushState({}, "", "list.html?" + listname + "@" + domain + ":" + d + ":" + encodeURIComponent(q));
+ }
// get the data from backend, push to page builder func
GetAsync("/api/stats.lua?list=" + listname + "&domain=" + domain + "&q=" + encodeURIComponent(q) + "&d=" + d, null, buildPage)
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f5f29a04/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index b403424..35cc253 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -138,7 +138,9 @@ function saveDraft() {
function hideComposer(evt, nosave) {
var es = evt ? (evt.target || evt.srcElement) : null;
if (!es || !es.getAttribute || !es.getAttribute("class") || (es.nodeName != 'A' && es.getAttribute("class").search(/label/) == -1)) {
- if (!nosave) saveDraft()
+ if (!nosave) {
+ saveDraft()
+ }
document.getElementById('splash').style.display = "none"
}
}
@@ -1361,7 +1363,9 @@ function openEmail() {
kiddos = []
traverseThread(document.body, '(thread|helper)_', 'DIV')
for (var i in kiddos) {
- if (kiddos[i].style.display == 'block') return true
+ if (kiddos[i].style.display == 'block') {
+ return true
+ }
}
return false
}
@@ -1758,11 +1762,15 @@ function toggleEmails_threaded(id, close, toverride, threadobj) {
helper.style.display = 'none'
prefs.groupBy = 'thread' // hack for now
thread.innerHTML = ""
- if (document.getElementById('bubble_' + id)) document.getElementById('bubble_' + id).style.display = 'block'
+ if (document.getElementById('bubble_' + id)) {
+ document.getElementById('bubble_' + id).style.display = 'block'
+ }
return
} else {
helper.style.display = 'block'
- if (document.getElementById('bubble_' + id)) document.getElementById('bubble_' + id).style.display = 'none'
+ if (document.getElementById('bubble_' + id)) {
+ document.getElementById('bubble_' + id).style.display = 'none'
+ }
}
if (!open_emails[id]) {
open_emails[id] = true
@@ -3283,11 +3291,15 @@ function toggleEmails_treeview(id, close, toverride) {
helper.style.display = 'none'
prefs.groupBy = 'treeview' // hack for now
thread.innerHTML = ""
- if (document.getElementById('bubble_' + id)) document.getElementById('bubble_' + id).style.display = 'block'
+ if (document.getElementById('bubble_' + id)) {
+ document.getElementById('bubble_' + id).style.display = 'block'
+ }
return
} else {
helper.style.display = 'block'
- if (document.getElementById('bubble_' + id)) document.getElementById('bubble_' + id).style.display = 'none'
+ if (document.getElementById('bubble_' + id)) {
+ document.getElementById('bubble_' + id).style.display = 'none'
+ }
}
if (!open_emails[id]) {
open_emails[id] = true
@@ -3462,10 +3474,18 @@ function makeNgramURL() {
var list = document.getElementById('listname').value
var timespan = document.getElementById('timespan').getAttribute("data")
var qs = []
- if (document.getElementById('stack').checked) qs.push("stack")
- if (document.getElementById('topics').checked) qs.push("topics")
- if (document.getElementById('avg').checked) qs.push("avg")
- if (document.getElementById('plaw').checked) qs.push("plaw")
+ if (document.getElementById('stack').checked) {
+ qs.push("stack")
+ }
+ if (document.getElementById('topics').checked) {
+ qs.push("topics")
+ }
+ if (document.getElementById('avg').checked) {
+ qs.push("avg")
+ }
+ if (document.getElementById('plaw').checked) {
+ qs.push("plaw")
+ }
for (n = 0; n < 20; n++) {
if (document.getElementById('query' + n) && document.getElementById('query' + n).value.length > 0) {
qs.push(document.getElementById('query' + n).value)
@@ -4426,7 +4446,9 @@ function toggleEmail(year, mo, nopush) {
xmo = '0' + xmo
}
// push history state, fetch the data from API
- if (!nopush) window.history.pushState({}, "", "list.html?" + xlist + ":" + year + '-' + xmo);
+ if (!nopush) {
+ window.history.pushState({}, "", "list.html?" + xlist + ":" + year + '-' + xmo);
+ }
GetAsync("/api/stats.lua?list=" + listname + "&domain=" + domain + "&s=" + s + "&e=" + e, null, buildPage)
// set list title to list and year/month
@@ -4469,7 +4491,9 @@ function search(q, d, nopush, all) {
clearCalendarHover()
// As usual, push new history state
- if (!nopush) window.history.pushState({}, "", "list.html?" + listname + "@" + domain + ":" + d + ":" + encodeURIComponent(q));
+ if (!nopush) {
+ window.history.pushState({}, "", "list.html?" + listname + "@" + domain + ":" + d + ":" + encodeURIComponent(q));
+ }
// get the data from backend, push to page builder func
GetAsync("/api/stats.lua?list=" + listname + "&domain=" + domain + "&q=" + encodeURIComponent(q) + "&d=" + d, null, buildPage)