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/29 17:07:04 UTC
[incubator-ponymail-foal] branch master updated (076c2ad -> b0faf9f)
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 076c2ad Add in list ID argument to be used if present
new 723b4fd Allow for specific list ID when querying by message-id
new b0faf9f 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 | 27 ++++++++++++++++++++-------
webui/js/source/primer.js | 25 +++++++++++++++++++------
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
7 files changed, 58 insertions(+), 32 deletions(-)
[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 b0faf9fe77b52faac5e69dff3716f603d11a602c
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Wed Dec 29 18:06:46 2021 +0100
Regen JS
---
webui/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 27 ++++++++++++++++++++-------
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
6 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index a7df8ce..b3f9f4f 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=863d049" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=723b4fd" 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=863d049"></script>
- <script src="js/wordcloud.js?revision=863d049"></script>
- <script src="js/ponymail.js?revision=863d049"></script>
+ <script src="js/config.js?revision=723b4fd"></script>
+ <script src="js/wordcloud.js?revision=723b4fd"></script>
+ <script src="js/ponymail.js?revision=723b4fd"></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 91e54d5..3d8d0e2 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=863d049" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=723b4fd" 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=863d049"></script>
- <script src="js/ponymail.js?revision=863d049"></script>
+ <script src="js/config.js?revision=723b4fd"></script>
+ <script src="js/ponymail.js?revision=723b4fd"></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 e5f1c59..fc2c966 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 = '863d049';
+const PONYMAIL_REVISION = '723b4fd';
/******************************************
@@ -3578,17 +3578,30 @@ function parseURL(state) {
function parse_permalink() {
// message id is the bit after the last /
let mid = location.href.split('/').pop();
- // Cut off any query string there might be
- if (mid.match(/\?/)) {
- mid = mid.replace(/\?.*$/, '');
+ mid = mid.replace(/\?.*/, ''); // Chop away any query string
+ // List-ID specified?
+ const query = unescape(location.search.substr(1));
+ let list_id = null;
+ if (query.length) {
+ if (query.match(/^<.+>$/)) {
+ list_id = query;
+ }
}
+
mid = unshortenID(mid); // In case of old school shortened links
init_preferences(); // blank call to load defaults like social rendering
GET('%sapi/preferences.lua'.format(G_apiURL), init_preferences, null);
// Fetch the thread data and pass to build_single_thread
- GET('%sapi/thread.lua?id=%s'.format(G_apiURL, mid), construct_single_thread, {
- cached: true
- });
+ if (list_id) {
+ GET('%sapi/thread.lua?id=%s&list=%s'.format(G_apiURL, mid, list_id), construct_single_thread, {
+ cached: true
+ });
+ }
+ else {
+ GET('%sapi/thread.lua?id=%s'.format(G_apiURL, mid), construct_single_thread, {
+ cached: true
+ });
+ }
}
diff --git a/webui/list.html b/webui/list.html
index de180e0..4e0d416 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=863d049" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=723b4fd" 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"/>
@@ -180,9 +180,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=863d049"></script>
- <script src="js/wordcloud.js?revision=863d049"></script>
- <script src="js/ponymail.js?revision=863d049"></script>
+ <script src="js/config.js?revision=723b4fd"></script>
+ <script src="js/wordcloud.js?revision=723b4fd"></script>
+ <script src="js/ponymail.js?revision=723b4fd"></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 2f39328..05c7f09 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=863d049" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=723b4fd" 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=863d049"></script>
- <script src="js/ponymail.js?revision=863d049"></script>
- <script src="js/oauth.js?revision=863d049"></script>
+ <script src="js/config.js?revision=723b4fd"></script>
+ <script src="js/ponymail.js?revision=723b4fd"></script>
+ <script src="js/oauth.js?revision=723b4fd"></script>
</body>
</html>
diff --git a/webui/thread.html b/webui/thread.html
index 5f20c9f..92732bf 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=863d049" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=723b4fd" 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=863d049"></script>
- <script src="js/wordcloud.js?revision=863d049"></script>
- <script src="js/ponymail.js?revision=863d049"></script>
+ <script src="js/config.js?revision=723b4fd"></script>
+ <script src="js/wordcloud.js?revision=723b4fd"></script>
+ <script src="js/ponymail.js?revision=723b4fd"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>
[incubator-ponymail-foal] 01/02: Allow for specific list ID when querying by message-id
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 723b4fde2f5f1bdb8b5ea1d2a1d1ff49df92dc6a
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Wed Dec 29 18:06:26 2021 +0100
Allow for specific list ID when querying by message-id
---
webui/js/source/primer.js | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/webui/js/source/primer.js b/webui/js/source/primer.js
index cbec6fc..30c6bc4 100644
--- a/webui/js/source/primer.js
+++ b/webui/js/source/primer.js
@@ -150,17 +150,30 @@ function parseURL(state) {
function parse_permalink() {
// message id is the bit after the last /
let mid = location.href.split('/').pop();
- // Cut off any query string there might be
- if (mid.match(/\?/)) {
- mid = mid.replace(/\?.*$/, '');
+ mid = mid.replace(/\?.*/, ''); // Chop away any query string
+ // List-ID specified?
+ const query = unescape(location.search.substr(1));
+ let list_id = null;
+ if (query.length) {
+ if (query.match(/^<.+>$/)) {
+ list_id = query;
+ }
}
+
mid = unshortenID(mid); // In case of old school shortened links
init_preferences(); // blank call to load defaults like social rendering
GET('%sapi/preferences.lua'.format(G_apiURL), init_preferences, null);
// Fetch the thread data and pass to build_single_thread
- GET('%sapi/thread.lua?id=%s'.format(G_apiURL, mid), construct_single_thread, {
- cached: true
- });
+ if (list_id) {
+ GET('%sapi/thread.lua?id=%s&list=%s'.format(G_apiURL, mid, list_id), construct_single_thread, {
+ cached: true
+ });
+ }
+ else {
+ GET('%sapi/thread.lua?id=%s'.format(G_apiURL, mid), construct_single_thread, {
+ cached: true
+ });
+ }
}