From 9370bdddaede2feeb581193158d83f5062d5a318 Mon Sep 17 00:00:00 2001 From: Miguel Angel Mulero Martinez Date: Wed, 27 Mar 2024 10:16:22 +0100 Subject: [PATCH] luci-mod-status: fix syslog / dmesg scroll for some themes The actual code moves the scroll in the window. This works for the bootstrap theme, because the scroll is at window level. But this does not work for other themes, like material. This commit changes the move of the scroll by "focusing" the window in the opposite button element in the syslog / dmesg page. In this way the move is automatically done by the browser. Another solution is to "search" in the parent until we find the scroll and move it, but seems less solid. Signed-off-by: Miguel Angel Mulero Martinez (cherry picked from commit 1164d276081a30923197299cacede3c6f4dce16e) --- .../htdocs/luci-static/resources/view/status/dmesg.js | 4 ++-- .../htdocs/luci-static/resources/view/status/syslog.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js index 89e2000abd..acddf454f5 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js @@ -22,7 +22,7 @@ return view.extend({ }, _('Scroll to tail', 'scroll to bottom (the tail) of the log file') ); scrollDownButton.addEventListener('click', function() { - window.scrollTo(0, document.body.scrollHeight); + scrollUpButton.focus(); }); var scrollUpButton = E('button', { @@ -31,7 +31,7 @@ return view.extend({ }, _('Scroll to head', 'scroll to top (the head) of the log file') ); scrollUpButton.addEventListener('click', function() { - window.scrollTo(0, 0); + scrollDownButton.focus(); }); return E([], [ diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js index d3de8af756..6ef7d09c70 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js @@ -28,7 +28,7 @@ return view.extend({ }, _('Scroll to tail', 'scroll to bottom (the tail) of the log file') ); scrollDownButton.addEventListener('click', function() { - window.scrollTo(0, document.body.scrollHeight); + scrollUpButton.focus(); }); var scrollUpButton = E('button', { @@ -37,7 +37,7 @@ return view.extend({ }, _('Scroll to head', 'scroll to top (the head) of the log file') ); scrollUpButton.addEventListener('click', function() { - window.scrollTo(0, 0); + scrollDownButton.focus(); }); return E([], [ -- 2.30.2