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/12/10 16:52:30 UTC
[incubator-ponymail-foal] branch master updated (23c4cf4 -> 180144d)
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 23c4cf4 extend spin time
new d024a91 set list and domain earlier so we can catch whether custom search tab needs list labels
new 180144d regen JS
The 2 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/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 14 +++++++++++---
webui/js/source/listview-header.js | 6 +++++-
webui/js/source/search.js | 6 +++++-
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
8 files changed, 40 insertions(+), 24 deletions(-)
[incubator-ponymail-foal] 01/02: set list and domain earlier so we can catch whether custom search tab needs list labels
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 d024a91da7ae36b88a9a59d2bda365e7b6498c2e
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Fri Dec 10 17:52:06 2021 +0100
set list and domain earlier so we can catch whether custom search tab needs list labels
---
webui/js/source/listview-header.js | 6 +++++-
webui/js/source/search.js | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/webui/js/source/listview-header.js b/webui/js/source/listview-header.js
index 1a7dea0..7b3192d 100644
--- a/webui/js/source/listview-header.js
+++ b/webui/js/source/listview-header.js
@@ -229,6 +229,7 @@ function listview_list_lists(state, json) {
}, "Search: %s".format(state.query));
li.setAttribute("data-url", state.url);
li.setAttribute("data-href", location.href);
+ li.setAttribute("data-list", '%s@%s'.format(state.list, state.domain));
lists.inject(li);
}
@@ -297,8 +298,12 @@ function switch_project(domain) {
function switch_list(list, from) {
let listid = list;
if (typeof list == 'object') {
+ listid = list.getAttribute("data-list") || list.innerText;
let dataURL = list.getAttribute('data-url');
if (dataURL) {
+ let bits = listid.split("@");
+ G_current_list = bits[0];
+ G_current_domain = bits[1];
GET(dataURL, renderListView, {
search: true,
cached: true
@@ -312,7 +317,6 @@ function switch_list(list, from) {
});
return;
}
- listid = list.getAttribute("data-list") || list.innerText;
}
let bits = listid.split("@");
G_current_list = bits[0];
diff --git a/webui/js/source/search.js b/webui/js/source/search.js
index 8bf629a..b334996 100644
--- a/webui/js/source/search.js
+++ b/webui/js/source/search.js
@@ -30,6 +30,8 @@ function search(query, date) {
}
let listid = '%s@%s'.format(list, domain);
+ G_current_list = list;
+ G_current_domain = domain;
let newhref = "list?%s:%s:%s".format(listid, date, query);
let header_from = document.getElementById('header_from');
@@ -56,7 +58,9 @@ function search(query, date) {
listview_list_lists({
url: sURL,
search: true,
- query: query
+ query: query,
+ list: list,
+ domain: domain
});
hideWindows(true);
document.getElementById('q').value = query;
[incubator-ponymail-foal] 02/02: 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 180144d9064f161db212ed95103f89a33d799678
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Fri Dec 10 17:52:21 2021 +0100
regen JS
---
webui/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 14 +++++++++++---
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
6 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 7d3d9f1..fcd5b02 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=8e9d30b" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=d024a91" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -79,9 +79,9 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=8e9d30b"></script>
- <script src="js/wordcloud.js?revision=8e9d30b"></script>
- <script src="js/ponymail.js?revision=8e9d30b"></script>
+ <script src="js/config.js?revision=d024a91"></script>
+ <script src="js/wordcloud.js?revision=d024a91"></script>
+ <script src="js/ponymail.js?revision=d024a91"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>
diff --git a/webui/index.html b/webui/index.html
index 7db1ee4..90a4cf3 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=8e9d30b" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=d024a91" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -60,8 +60,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=8e9d30b"></script>
- <script src="js/ponymail.js?revision=8e9d30b"></script>
+ <script src="js/config.js?revision=d024a91"></script>
+ <script src="js/ponymail.js?revision=d024a91"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index c7941a6..1a78d8e 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = '8e9d30b';
+const PONYMAIL_REVISION = 'd024a91';
/******************************************
@@ -2435,6 +2435,7 @@ function listview_list_lists(state, json) {
}, "Search: %s".format(state.query));
li.setAttribute("data-url", state.url);
li.setAttribute("data-href", location.href);
+ li.setAttribute("data-list", '%s@%s'.format(state.list, state.domain));
lists.inject(li);
}
@@ -2503,8 +2504,12 @@ function switch_project(domain) {
function switch_list(list, from) {
let listid = list;
if (typeof list == 'object') {
+ listid = list.getAttribute("data-list") || list.innerText;
let dataURL = list.getAttribute('data-url');
if (dataURL) {
+ let bits = listid.split("@");
+ G_current_list = bits[0];
+ G_current_domain = bits[1];
GET(dataURL, renderListView, {
search: true,
cached: true
@@ -2518,7 +2523,6 @@ function switch_list(list, from) {
});
return;
}
- listid = list.getAttribute("data-list") || list.innerText;
}
let bits = listid.split("@");
G_current_list = bits[0];
@@ -4080,6 +4084,8 @@ function search(query, date) {
}
let listid = '%s@%s'.format(list, domain);
+ G_current_list = list;
+ G_current_domain = domain;
let newhref = "list?%s:%s:%s".format(listid, date, query);
let header_from = document.getElementById('header_from');
@@ -4106,7 +4112,9 @@ function search(query, date) {
listview_list_lists({
url: sURL,
search: true,
- query: query
+ query: query,
+ list: list,
+ domain: domain
});
hideWindows(true);
document.getElementById('q').value = query;
diff --git a/webui/list.html b/webui/list.html
index f396829..f67899f 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=8e9d30b" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=d024a91" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -173,9 +173,9 @@ the License. -->
</script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=8e9d30b"></script>
- <script src="js/wordcloud.js?revision=8e9d30b"></script>
- <script src="js/ponymail.js?revision=8e9d30b"></script>
+ <script src="js/config.js?revision=d024a91"></script>
+ <script src="js/wordcloud.js?revision=d024a91"></script>
+ <script src="js/ponymail.js?revision=d024a91"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
<script type="text/javascript">
diff --git a/webui/oauth.html b/webui/oauth.html
index b030454..d3cb970 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=8e9d30b" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=d024a91" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=8e9d30b"></script>
- <script src="js/ponymail.js?revision=8e9d30b"></script>
- <script src="js/oauth.js?revision=8e9d30b"></script>
+ <script src="js/config.js?revision=d024a91"></script>
+ <script src="js/ponymail.js?revision=d024a91"></script>
+ <script src="js/oauth.js?revision=d024a91"></script>
</body>
</html>
diff --git a/webui/thread.html b/webui/thread.html
index 2eec387..1ef3d98 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=8e9d30b" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=d024a91" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -97,9 +97,9 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=8e9d30b"></script>
- <script src="js/wordcloud.js?revision=8e9d30b"></script>
- <script src="js/ponymail.js?revision=8e9d30b"></script>
+ <script src="js/config.js?revision=d024a91"></script>
+ <script src="js/wordcloud.js?revision=d024a91"></script>
+ <script src="js/ponymail.js?revision=d024a91"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>