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 5fbdd71b2d10fc45f8a69c206dd21f9e22bd6f98 Author: Daniel Gruno <[email protected]> AuthorDate: Sun Nov 21 03:12:33 2021 +0100 regen JS --- webui/js/ponymail.js | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js index e10fcfd..108d337 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 = "1cc461d"; +const PONYMAIL_REVISION = "44efe36"; @@ -3191,14 +3191,38 @@ function init_preferences(state, json) { } } - // color some links - let cl = document.getElementById('chatty_link'); + // Set chatty/plain email rendering mode: + let cl = document.getElementById('chatty_link'); // legacy button if (cl) { cl.setAttribute("class", G_chatty_layout ? "enabled" : "disabled"); } + let cle = document.getElementById('email_mode_chatty'); + if (cle) { + cle.checked = G_chatty_layout; + } + let cld = document.getElementById('email_mode_plain'); + if (cld) { + cld.checked = !G_chatty_layout; + } + + // Set list display mode: + let dmt = document.getElementById('display_mode_threaded'); + if (dmt) { + dmt.checked = (G_current_listmode == 'threaded'); + } + let dmf = document.getElementById('display_mode_flat'); + if (dmf) { + dmf.checked = (G_current_listmode == 'flat'); + } + let dmtr = document.getElementById('display_mode_treeview'); + if (dmtr) { + dmtr.checked = (G_current_listmode == 'treeview'); + } + + if (G_ponymail_preferences.login && G_ponymail_preferences.login.credentials) { - let prefsmenu = document.getElementById('prefs_dropdown'); + let prefsmenu = document.getElementById('login_dropdown') || document.getElementById('prefs_dropdown'); let uimg = document.getElementById('uimg'); uimg.setAttribute("src", "images/user.png"); uimg.setAttribute("title", "Logged in as %s".format(G_ponymail_preferences.login.credentials.fullname)); @@ -3214,7 +3238,7 @@ function init_preferences(state, json) { prefsmenu.inject(li); } else { - let prefsmenu = document.getElementById('prefs_dropdown'); + let prefsmenu = document.getElementById('login_dropdown') || document.getElementById('prefs_dropdown'); if (prefsmenu) { prefsmenu.innerHTML = ""; let login = new HTML('a', { @@ -3269,7 +3293,11 @@ function set_theme(theme) { } function set_skin(skin) { - G_chatty_layout = !G_chatty_layout; + if (typeof(enable_chatty) === "boolean") { + G_chatty_layout = enable_chatty; + } else { + G_chatty_layout = !G_chatty_layout; + } let cl = document.getElementById('chatty_link'); if (cl) { cl.setAttribute("class", G_chatty_layout ? "enabled" : "disabled"); @@ -3280,8 +3308,12 @@ function set_skin(skin) { } // set_skin, but for permalinks -function set_skin_permalink(skin) { - G_chatty_layout = !G_chatty_layout; +function set_skin_permalink(enable_chatty) { + if (typeof(enable_chatty) === "boolean") { + G_chatty_layout = enable_chatty; + } else { + G_chatty_layout = !G_chatty_layout; + } let cl = document.getElementById('chatty_link'); if (cl) { cl.setAttribute("class", G_chatty_layout ? "enabled" : "disabled");
