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-foal.git
The following commit(s) were added to refs/heads/master by this push:
new 6c31b8a More variable tidy up
6c31b8a is described below
commit 6c31b8af33f82b9b05ee2981c8e2dd3a80f74840
Author: Sebb <[email protected]>
AuthorDate: Wed Nov 17 23:36:42 2021 +0000
More variable tidy up
---
webui/js/config.js | 8 ++------
webui/js/ponymail.js | 18 ++++++++----------
webui/js/source/listview-flat.js | 2 +-
webui/js/source/listview-threaded.js | 2 +-
webui/js/source/render-email.js | 2 +-
webui/js/source/sidebar-calendar.js | 8 +++-----
webui/js/source/sidebar-stats.js | 2 +-
7 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/webui/js/config.js b/webui/js/config.js
index 08bbf09..a900a70 100644
--- a/webui/js/config.js
+++ b/webui/js/config.js
@@ -66,11 +66,7 @@ var prefs = {
title: "Apache Pony Mail" // Default browser window title
}
-// array of prefs we have now. This is needed in case we change/break the
existing
-// structure saved in elasticsearch for users. Update when needed!
-var pref_keys =
['displayMode','groupBy','sortOrder','compactQuotes','notifications','hideStats','theme',
'fullname', 'autoScale']
-
// Gravatar support. Defaults to using the gravatar proxy.
-var gravatar_url = "/api/gravatar?md5=%s";
+const GRAVATAR_URL = "/api/gravatar?md5=%s";
// For performance or other reasons, this can be set to the origin by
uncommenting the below:
-// var gravatar_url =
"https://secure.gravatar.com/avatar/%s.png?s=96&r=g&d=mm";;
+// const GRAVATAR_URL =
"https://secure.gravatar.com/avatar/%s.png?s=96&r=g&d=mm";;
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index b9cfc2f..b8fc7ee 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT source/*.js!!
-const PONYMAIL_REVISION = "5ecd672";
+const PONYMAIL_REVISION = "8e55477";
@@ -2140,7 +2140,7 @@ function listview_flat_element(eml, idx) {
// Add gravatar
let gravatar = new HTML('img', {
class: "gravatar",
- src: gravatar_url.format(eml.gravatar)
+ src: GRAVATAR_URL.format(eml.gravatar)
});
element.inject(gravatar);
@@ -2643,7 +2643,7 @@ function listview_threaded_element(thread, idx) {
// Add gravatar
let gravatar = new HTML('img', {
class: "gravatar",
- src: gravatar_url.format(eml.gravatar)
+ src: GRAVATAR_URL.format(eml.gravatar)
});
element.inject(gravatar);
@@ -3748,7 +3748,7 @@ async function render_email_chatty(state, json) {
});
let gravatar = new HTML('img', {
class: "chatty_gravatar",
- src: gravatar_url.format(json.gravatar)
+ src: GRAVATAR_URL.format(json.gravatar)
});
let author_name = json.from.replace(/\s*<.+>/, "").replace(/"/g, '');
let author_email = json.from.match(/\s*<(.+@.+)>\s*/);
@@ -4071,9 +4071,7 @@ function search_set_list(what) {
Fetched from source/sidebar-calendar.js
******************************************/
-var months_shortened = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul',
'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-var default_start_year = 1990;
-var default_end_year = 2100;
+const MONTHS_SHORTENED = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul',
'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
var calendar_index = 0;
var calendar_years_shown = 4;
@@ -4123,8 +4121,8 @@ function renderCalendar(FY, FM, LY, LM, activity = null) {
});
ydiv.inject(txt(Y));
ydiv.inject(new HTML('br'));
- for (var i = 0; i < months_shortened.length; i++) {
- let mon = months_shortened[i];
+ for (var i = 0; i < MONTHS_SHORTENED.length; i++) {
+ let mon = MONTHS_SHORTENED[i];
let mdiv = new HTML('div', {
onclick: 'calendar_click(%u, %u);'.format(Y, i + 1),
class: 'sidebar_calendar_month'
@@ -4300,7 +4298,7 @@ async function sidebar_stats(json) {
});
let pimg = new HTML('img', {
class: "gravatar_sm",
- src: gravatar_url.format(par.gravatar)
+ src: GRAVATAR_URL.format(par.gravatar)
})
pdiv.inject(pimg);
pdiv.inject(new HTML('b', {}, par.name + ": "));
diff --git a/webui/js/source/listview-flat.js b/webui/js/source/listview-flat.js
index 727145b..211fc2c 100644
--- a/webui/js/source/listview-flat.js
+++ b/webui/js/source/listview-flat.js
@@ -76,7 +76,7 @@ function listview_flat_element(eml, idx) {
// Add gravatar
let gravatar = new HTML('img', {
class: "gravatar",
- src: gravatar_url.format(eml.gravatar)
+ src: GRAVATAR_URL.format(eml.gravatar)
});
element.inject(gravatar);
diff --git a/webui/js/source/listview-threaded.js
b/webui/js/source/listview-threaded.js
index 8112d15..481cf5c 100644
--- a/webui/js/source/listview-threaded.js
+++ b/webui/js/source/listview-threaded.js
@@ -119,7 +119,7 @@ function listview_threaded_element(thread, idx) {
// Add gravatar
let gravatar = new HTML('img', {
class: "gravatar",
- src: gravatar_url.format(eml.gravatar)
+ src: GRAVATAR_URL.format(eml.gravatar)
});
element.inject(gravatar);
diff --git a/webui/js/source/render-email.js b/webui/js/source/render-email.js
index 1627ed7..310775c 100644
--- a/webui/js/source/render-email.js
+++ b/webui/js/source/render-email.js
@@ -237,7 +237,7 @@ async function render_email_chatty(state, json) {
});
let gravatar = new HTML('img', {
class: "chatty_gravatar",
- src: gravatar_url.format(json.gravatar)
+ src: GRAVATAR_URL.format(json.gravatar)
});
let author_name = json.from.replace(/\s*<.+>/, "").replace(/"/g, '');
let author_email = json.from.match(/\s*<(.+@.+)>\s*/);
diff --git a/webui/js/source/sidebar-calendar.js
b/webui/js/source/sidebar-calendar.js
index ec9598a..df81368 100644
--- a/webui/js/source/sidebar-calendar.js
+++ b/webui/js/source/sidebar-calendar.js
@@ -15,9 +15,7 @@
limitations under the License.
*/
-var months_shortened = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul',
'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-var default_start_year = 1990;
-var default_end_year = 2100;
+const MONTHS_SHORTENED = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul',
'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
var calendar_index = 0;
var calendar_years_shown = 4;
@@ -67,8 +65,8 @@ function renderCalendar(FY, FM, LY, LM, activity = null) {
});
ydiv.inject(txt(Y));
ydiv.inject(new HTML('br'));
- for (var i = 0; i < months_shortened.length; i++) {
- let mon = months_shortened[i];
+ for (var i = 0; i < MONTHS_SHORTENED.length; i++) {
+ let mon = MONTHS_SHORTENED[i];
let mdiv = new HTML('div', {
onclick: 'calendar_click(%u, %u);'.format(Y, i + 1),
class: 'sidebar_calendar_month'
diff --git a/webui/js/source/sidebar-stats.js b/webui/js/source/sidebar-stats.js
index e65ca08..9f60925 100644
--- a/webui/js/source/sidebar-stats.js
+++ b/webui/js/source/sidebar-stats.js
@@ -59,7 +59,7 @@ async function sidebar_stats(json) {
});
let pimg = new HTML('img', {
class: "gravatar_sm",
- src: gravatar_url.format(par.gravatar)
+ src: GRAVATAR_URL.format(par.gravatar)
})
pdiv.inject(pimg);
pdiv.inject(new HTML('b', {}, par.name + ": "));
![https://secure.gravatar.com/avatar/%s.png?s=96&r=g&d=mm"](https://secure.gravatar.com/avatar/%s.png?s=96&r=g&d=mm"){kind=link}