mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-18 13:24:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix slider behavior when using navigate back button (#8496)

Browse Source 
Closes https://github.com/FreshRSS/FreshRSS/issues/8488

* Ensure leave confirmation is shown by preventing navigation using the [Navigation API](https://developer.mozilla.org/en-US/docs/Web/API/Navigation_API)
* Prevent scroll lock by removing it on `hashchange` instead of `onclick` on the close buttons
This commit is contained in:
Inverle
2026-02-08 20:42:20 +01:00
committed by GitHub
parent d7848e9fd6
commit 6b5304b825
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
p/scripts/extra.js
View File

@@ -362,6 +362,18 @@ function open_slider_listener(ev) {
f.insertAdjacentHTML('afterbegin', '<input type="hidden" name="slider" value="1" />'); f.insertAdjacentHTML('afterbegin', '<input type="hidden" name="slider" value="1" />');
}); });
context.ajax_loading = false; context.ajax_loading = false;
window.addEventListener('hashchange', () => {
if (location.hash.substr(1) === 'slider') {
// Triggers when slider is closed
window.addEventListener('hashchange', () => {
location.hash = 'close';
slider.querySelectorAll('form').forEach(function (f) { f.reset(); });
document.documentElement.classList.remove('slider-active');
}, { once: true });
}
}, { once: true });
slider.dispatchEvent(freshrssSliderLoadEvent); slider.dispatchEvent(freshrssSliderLoadEvent);
}; };
req.send(); req.send();
@@ -384,8 +396,6 @@ function init_slider(slider) {
function close_slider_listener(ev) { function close_slider_listener(ev) {
const slider = document.getElementById('slider'); const slider = document.getElementById('slider');
if (data_leave_validation(slider) || confirm(context.i18n.confirm_exit_slider)) { if (data_leave_validation(slider) || confirm(context.i18n.confirm_exit_slider)) {
slider.querySelectorAll('form').forEach(function (f) { f.reset(); });
document.documentElement.classList.remove('slider-active');
return true; return true;
} }
if (ev) { if (ev) {

17
p/scripts/main.js
View File

@@ -1125,8 +1125,8 @@ function init_column_categories() {
// Wait for dropdown to be closed so it can be removed // Wait for dropdown to be closed so it can be removed
// Dropdown visibility is based on CSS :target // Dropdown visibility is based on CSS :target
window.addEventListener('hashchange', () => { window.addEventListener('hashchange', () => {
dropdownMenu.nextElementSibling.remove(); // dropdown close dropdownMenu?.nextElementSibling?.remove(); // dropdown close
dropdownMenu.remove(); dropdownMenu?.remove();
}, { once: true }); }, { once: true });
}, { once: true }); }, { once: true });
@@ -2359,12 +2359,25 @@ function init_main_beforeDOM() {
} }
} }
function init_navigation_handler() {
navigation.addEventListener('navigate', (e) => {
if (!(e.canIntercept && e.hashChange && e.navigationType === 'traverse')) {
return;
}
if (location.hash.substr(1) === 'slider' && !close_slider_listener()) {
e.preventDefault();
}
});
}
function init_main_afterDOM() { function init_main_afterDOM() {
removeFirstLoadSpinner(); removeFirstLoadSpinner();
init_notifications(); init_notifications();
init_csp_alert(); init_csp_alert();
init_confirm_action(); init_confirm_action();
init_nav_menu(); init_nav_menu();
init_navigation_handler();
const stream = document.getElementById('stream'); const stream = document.getElementById('stream');
if (stream) { if (stream) {
init_load_more(stream); init_load_more(stream);