You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2021/09/21 20:14:00 UTC
[incubator-ponymail-foal] branch master updated (7bdaf88 -> fc2f1b4)
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.
from 7bdaf88 slight font tweak for calendar counts
new edbbd15 make calendar click utilize previous search parameters
new 2b94aed regen JS
new 637265c fix GET as well
new fc2f1b4 regen JS
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
webui/js/ponymail.js | 13 +++++++++----
webui/js/source/sidebar-calendar.js | 13 +++++++++----
2 files changed, 18 insertions(+), 8 deletions(-)
[incubator-ponymail-foal] 01/04: make calendar click utilize
previous search parameters
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit edbbd15a06053109263fb706432cc3eacc0d5dda
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Tue Sep 21 15:11:44 2021 -0500
make calendar click utilize previous search parameters
---
webui/js/source/sidebar-calendar.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/webui/js/source/sidebar-calendar.js b/webui/js/source/sidebar-calendar.js
index 56f5562..c62b7bc 100644
--- a/webui/js/source/sidebar-calendar.js
+++ b/webui/js/source/sidebar-calendar.js
@@ -166,11 +166,16 @@ function calendar_click(year, month) {
current_month = month;
searching = false;
let q = "";
- let newhref = "list.html?%s@%s:%u-%u".format(current_list, current_domain, year, month);
+ let calendar_current_list = current_list;
+ let calendar_current_domain = current_domain;
if (current_json && current_json.searchParams && current_json.searchParams.q) {
q = current_json.searchParams.q;
- newhref += ":" + q;
+ calendar_current_list = current_json.searchParams.list;
+ calendar_current_domain = current_json.searchParams.domain;
}
+ let newhref = "list?%s@%s:%u-%u".format(calendar_current_list, calendar_current_domain, year, month);
+ if (q && q.length > 0) newhref += ":" + q;
+
if (location.href !== newhref) {
window.history.pushState({}, null, newhref);
}
[incubator-ponymail-foal] 02/04: regen JS
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 2b94aed930357f8fd635716d62addfce25c4d469
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Tue Sep 21 15:11:53 2021 -0500
regen JS
---
webui/js/ponymail.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 28bbc51..a0b89de 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -3971,11 +3971,16 @@ function calendar_click(year, month) {
current_month = month;
searching = false;
let q = "";
- let newhref = "list.html?%s@%s:%u-%u".format(current_list, current_domain, year, month);
+ let calendar_current_list = current_list;
+ let calendar_current_domain = current_domain;
if (current_json && current_json.searchParams && current_json.searchParams.q) {
q = current_json.searchParams.q;
- newhref += ":" + q;
+ calendar_current_list = current_json.searchParams.list;
+ calendar_current_domain = current_json.searchParams.domain;
}
+ let newhref = "list?%s@%s:%u-%u".format(calendar_current_list, calendar_current_domain, year, month);
+ if (q && q.length > 0) newhref += ":" + q;
+
if (location.href !== newhref) {
window.history.pushState({}, null, newhref);
}
[incubator-ponymail-foal] 03/04: fix GET as well
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 637265cf2e8c8b966b9f8be0c6d6a9a6e9474864
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Tue Sep 21 15:12:55 2021 -0500
fix GET as well
---
webui/js/source/sidebar-calendar.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/webui/js/source/sidebar-calendar.js b/webui/js/source/sidebar-calendar.js
index c62b7bc..0c9ecc5 100644
--- a/webui/js/source/sidebar-calendar.js
+++ b/webui/js/source/sidebar-calendar.js
@@ -179,8 +179,8 @@ function calendar_click(year, month) {
if (location.href !== newhref) {
window.history.pushState({}, null, newhref);
}
- GET('%sapi/stats.lua?list=%s&domain=%s&d=%u-%u&q=%s'.format(apiURL, current_list, current_domain, year, month, q), renderListView, {
- to: '%s@%s'.format(current_list, current_domain),
+ GET('%sapi/stats.lua?list=%s&domain=%s&d=%u-%u&q=%s'.format(apiURL, calendar_current_list, calendar_current_domain, year, month, q), renderListView, {
+ to: '%s@%s'.format(calendar_current_list, calendar_current_domain),
update_calendar: false
});
}
[incubator-ponymail-foal] 04/04: regen JS
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit fc2f1b419762c7d1102b7067436c80efb1736380
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Tue Sep 21 15:13:48 2021 -0500
regen JS
---
webui/js/ponymail.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index a0b89de..e9f4ba1 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -3984,8 +3984,8 @@ function calendar_click(year, month) {
if (location.href !== newhref) {
window.history.pushState({}, null, newhref);
}
- GET('%sapi/stats.lua?list=%s&domain=%s&d=%u-%u&q=%s'.format(apiURL, current_list, current_domain, year, month, q), renderListView, {
- to: '%s@%s'.format(current_list, current_domain),
+ GET('%sapi/stats.lua?list=%s&domain=%s&d=%u-%u&q=%s'.format(apiURL, calendar_current_list, calendar_current_domain, year, month, q), renderListView, {
+ to: '%s@%s'.format(calendar_current_list, calendar_current_domain),
update_calendar: false
});
}