From bf90e369d373e0841647ef721358b857d7356d72 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Fri, 21 Jul 2023 15:07:57 +0200
Subject: [PATCH] Revert "check for sidebar existence, fixes #2918"
This reverts commit 8e113deeb0cddaad2135f7f1d23a9d6c10e597f7.
---
resources/assets/javascripts/lib/sidebar.js | 38 ++++++++-------------
1 file changed, 15 insertions(+), 23 deletions(-)
diff --git a/resources/assets/javascripts/lib/sidebar.js b/resources/assets/javascripts/lib/sidebar.js
index 17362fa017c..eefd317beaf 100644
--- a/resources/assets/javascripts/lib/sidebar.js
+++ b/resources/assets/javascripts/lib/sidebar.js
@@ -2,11 +2,8 @@ const Sidebar = {
place() {
const header = document.getElementById('main-header');
- const sidebar = document.getElementById('sidebar');
- if (sidebar) {
- sidebar.style.top =
- header.offsetTop + header.offsetHeight + 'px';
- }
+ document.getElementById('sidebar').style.top =
+ header.offsetTop + header.offsetHeight + 'px';
},
observeSidebar() {
@@ -19,11 +16,8 @@ const Sidebar = {
/**
* Observe if sidebar fits into viewport.
*/
- const sidebar = document.getElementById('sidebar');
- if (sidebar) {
- const sObserver = new IntersectionObserver(STUDIP.Sidebar.fits, options);
- sObserver.observe();
- }
+ const sObserver = new IntersectionObserver(STUDIP.Sidebar.fits, options);
+ sObserver.observe(document.getElementById('sidebar'));
},
observeBody() {
@@ -93,20 +87,18 @@ const Sidebar = {
footerVisible(entries, observer) {
const sidebar = document.getElementById('sidebar');
- if (sidebar) {
- entries.forEach(entry => {
- // Footer is visible on current page.
- if (entry.isIntersecting) {
- if (sidebar.classList.contains('no-footer')) {
- sidebar.classList.remove('no-footer');
- }
- } else {
- if (!sidebar.classList.contains('no-footer')) {
- sidebar.classList.add('no-footer');
- }
+ entries.forEach(entry => {
+ // Footer is visible on current page.
+ if (entry.isIntersecting) {
+ if (sidebar.classList.contains('no-footer')) {
+ sidebar.classList.remove('no-footer');
}
- });
- }
+ } else {
+ if (!sidebar.classList.contains('no-footer')) {
+ sidebar.classList.add('no-footer');
+ }
+ }
+ });
}
};
--
GitLab