From 39cc1c11ec596176e842cc98e6a54337e3c04d7e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 26 Feb 2024 09:01:03 +0100 Subject: New feature: shareable user query (#6052) * New feature: shareable user query Share the output of a user query by RSS / HTML / OPML with other people through unique URLs. Replaces the global admin token, which was the only option (but unsafe) to share RSS outputs with other people. Also add a new HTML output for people without an RSS reader. fix https://github.com/FreshRSS/FreshRSS/issues/3066#issuecomment-648977890 fix https://github.com/FreshRSS/FreshRSS/issues/3178#issuecomment-769435504 * Remove unused method * Fix token saving * Implement HTML view * Update i18n for master token * Revert i18n get_favorite * Fix missing i18n for user queries from before this PR * Remove irrelevant tests * Add link to RSS version * Fix getGet * Fix getState * Fix getSearch * Alternative getSearch * Default getOrder * Explicit default state * Fix test * Add OPML sharing * Remove many redundant SQL queries from original implementation of user queries * Fix article tags * Use default user settings * Prepare public search * Fixes * Allow user search on article tags * Implement user search * Revert filter bug * Revert wrong SQL left outer join change * Implement checkboxes * Safe check of OPML * Fix label * Remove RSS button to favour new sharing method That sharing button was using a global admin token * First version of HTTP 304 * Disallow some recusrivity fix https://github.com/FreshRSS/FreshRSS/issues/6086 * Draft of nav * Minor httpConditional * Add support for offset for pagination * Fix offset pagination * Fix explicit order ASC * Add documentation * Help links i18n * Note about deprecated master token * Typo * Doc about format --- p/scripts/main.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'p/scripts/main.js') diff --git a/p/scripts/main.js b/p/scripts/main.js index ca52bac56..d07568617 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -439,7 +439,7 @@ function toggleContent(new_active, old_active, skipping) { const nav_menu = document.querySelector('.nav_menu'); let nav_menu_height = 0; - if (getComputedStyle(nav_menu).position === 'fixed' || getComputedStyle(nav_menu).position === 'sticky') { + if (nav_menu && (getComputedStyle(nav_menu).position === 'fixed' || getComputedStyle(nav_menu).position === 'sticky')) { nav_menu_height = nav_menu.offsetHeight; } @@ -1941,11 +1941,14 @@ function init_main_afterDOM() { if (stream) { init_load_more(stream); init_posts(); - init_nav_entries(); - init_notifs_html5(); - toggle_bigMarkAsRead_button(); - setTimeout(faviconNbUnread, 1000); - setInterval(refreshUnreads, 120000); + if (document.getElementById('new-article')) { + // Only relevant for interactive views + init_nav_entries(); + init_notifs_html5(); + toggle_bigMarkAsRead_button(); + setTimeout(faviconNbUnread, 1000); + setInterval(refreshUnreads, 120000); + } } if (window.console) { -- cgit v1.2.3