aboutsummaryrefslogtreecommitdiff
path: root/p/scripts
diff options
context:
space:
mode:
authorGravatar maTh <math-home@web.de> 2022-05-30 23:06:50 +0200
committerGravatar GitHub <noreply@github.com> 2022-05-30 23:06:50 +0200
commit992b906062e9c737200a1fad93e5c38e9c646bc2 (patch)
tree015bf3e00553698dd4d140a91d3f95be65d1b9be /p/scripts
parent98f9409155a95c4f63874251f34b5e5592255fd0 (diff)
Slider: close via shortcut (#4394)
* change close-slider behind slider * open/close slider via anchor * use shortcuts globaly * deleted debugging console.log()
Diffstat (limited to 'p/scripts')
-rw-r--r--p/scripts/extra.js7
-rw-r--r--p/scripts/main.js2
2 files changed, 2 insertions, 7 deletions
diff --git a/p/scripts/extra.js b/p/scripts/extra.js
index a95eb620d..39f9d049a 100644
--- a/p/scripts/extra.js
+++ b/p/scripts/extra.js
@@ -148,7 +148,7 @@ function open_slider_listener(ev) {
const a = ev.target.closest('.open-slider');
if (a) {
if (!context.ajax_loading) {
- location.href = '#'; // close menu/dropdown
+ location.href = '#slider'; // close menu/dropdown
context.ajax_loading = true;
const req = new XMLHttpRequest();
@@ -156,11 +156,8 @@ function open_slider_listener(ev) {
req.responseType = 'document';
req.onload = function (e) {
const slider = document.getElementById('slider');
- const closer = document.getElementById('close-slider');
slider.scrollTop = 0;
slider.innerHTML = this.response.body.innerHTML;
- slider.classList.add('active');
- closer.classList.add('active');
context.ajax_loading = false;
slider.dispatchEvent(freshrssSliderLoadEvent);
};
@@ -177,8 +174,6 @@ function init_slider(slider) {
closer.addEventListener('click', function (ev) {
if (data_leave_validation(slider) || confirm(context.i18n.confirmation_default)) {
slider.querySelectorAll('form').forEach(function (f) { f.reset(); });
- closer.classList.remove('active');
- slider.classList.remove('active');
return true;
} else {
return false;
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 035b66c53..1eb8a1ff8 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1721,7 +1721,6 @@ function init_normal() {
}
init_column_categories();
init_stream(stream);
- init_shortcuts();
init_actualize();
faviconNbUnread();
@@ -1738,6 +1737,7 @@ function init_normal() {
function init_main_beforeDOM() {
document.scrollingElement.scrollTop = 0;
+ init_shortcuts();
if (['normal', 'reader', 'global'].indexOf(context.current_view) >= 0) {
init_normal();
}