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 ad6b270dab551809a45ddae746629caecb6c7b18 Author: Daniel Gruno <[email protected]> AuthorDate: Fri Dec 10 20:30:17 2021 +0100 regen JS --- webui/admin.html | 8 ++++---- webui/index.html | 6 +++--- webui/js/ponymail.js | 13 +++++++++---- webui/list.html | 8 ++++---- webui/oauth.html | 8 ++++---- webui/thread.html | 8 ++++---- 6 files changed, 28 insertions(+), 23 deletions(-) diff --git a/webui/admin.html b/webui/admin.html index a4f3c45..2c3a9da 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=ad20497" rel="stylesheet" media="all"> + <link href="css/scaffolding.css?revision=82a522d" 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=ad20497"></script> - <script src="js/wordcloud.js?revision=ad20497"></script> - <script src="js/ponymail.js?revision=ad20497"></script> + <script src="js/config.js?revision=82a522d"></script> + <script src="js/wordcloud.js?revision=82a522d"></script> + <script src="js/ponymail.js?revision=82a522d"></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 5f8d6db..b0ff431 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=ad20497" rel="stylesheet" media="all"> + <link href="css/scaffolding.css?revision=82a522d" 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=ad20497"></script> - <script src="js/ponymail.js?revision=ad20497"></script> + <script src="js/config.js?revision=82a522d"></script> + <script src="js/ponymail.js?revision=82a522d"></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 994d137..1322331 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 = 'ad20497'; +const PONYMAIL_REVISION = '82a522d'; /****************************************** @@ -2777,7 +2777,8 @@ function listview_threaded_element(thread, idx) { ******************************************/ function find_email(json, id) { - for (let eml of json.emails) { + if (!json) return + for (let eml of json.emails || []) { if (id === eml.id) return eml } } @@ -2788,8 +2789,12 @@ function listview_treeview(json, start) { let s = start || 0; let email_ordered = []; for (let thread of json.thread_struct) { - email_ordered.push(find_email(json, thread.tid)); - for (let child of thread.children) email_ordered.push(find_email(json, child.tid)); + let eml = find_email(json, thread.tid); + if (eml) email_ordered.push(eml); + for (let child of thread.children) { + let eml = find_email(json, child.tid); + if (eml) email_ordered.push(eml); + } } if (email_ordered.length) { for (let n = s; n < (s + G_current_per_page); n++) { diff --git a/webui/list.html b/webui/list.html index d422de9..6588381 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=ad20497" rel="stylesheet" media="all"> + <link href="css/scaffolding.css?revision=82a522d" 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=ad20497"></script> - <script src="js/wordcloud.js?revision=ad20497"></script> - <script src="js/ponymail.js?revision=ad20497"></script> + <script src="js/config.js?revision=82a522d"></script> + <script src="js/wordcloud.js?revision=82a522d"></script> + <script src="js/ponymail.js?revision=82a522d"></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 430ef9a..3aa3563 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=ad20497" rel="stylesheet" media="all"> + <link href="css/scaffolding.css?revision=82a522d" 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=ad20497"></script> - <script src="js/ponymail.js?revision=ad20497"></script> - <script src="js/oauth.js?revision=ad20497"></script> + <script src="js/config.js?revision=82a522d"></script> + <script src="js/ponymail.js?revision=82a522d"></script> + <script src="js/oauth.js?revision=82a522d"></script> </body> </html> diff --git a/webui/thread.html b/webui/thread.html index e0f3a92..5a0c9cf 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=ad20497" rel="stylesheet" media="all"> + <link href="css/scaffolding.css?revision=82a522d" 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=ad20497"></script> - <script src="js/wordcloud.js?revision=ad20497"></script> - <script src="js/ponymail.js?revision=ad20497"></script> + <script src="js/config.js?revision=82a522d"></script> + <script src="js/wordcloud.js?revision=82a522d"></script> + <script src="js/ponymail.js?revision=82a522d"></script> <div id="splash" class="splash fade-in"> </div> <div style="clear: both;"></div> </body>
