From dae14735aaa00a696ef897076ad0c80acf017940 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 21 Feb 2022 08:11:54 +0000
Subject: [PATCH] fix active element detection, fixes #627
---
.../assets/javascripts/lib/skip_links.js | 31 ++++++++++---------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/resources/assets/javascripts/lib/skip_links.js b/resources/assets/javascripts/lib/skip_links.js
index 1a4a9d0c98d..7a4d9c9bc28 100644
--- a/resources/assets/javascripts/lib/skip_links.js
+++ b/resources/assets/javascripts/lib/skip_links.js
@@ -1,3 +1,14 @@
+// Taken from https://stackoverflow.com/a/42149818
+const isSelectorValid = (dummyElement =>
+ selector => {
+ try {
+ dummyElement.querySelector(selector);
+ } catch {
+ return false;
+ }
+ return true;
+})(document.createDocumentFragment());
+
const SkipLinks = {
activeElement: null,
navigationStatus: 0,
@@ -10,7 +21,6 @@ const SkipLinks = {
if (event.keyCode === 9) {
//tab-key
SkipLinks.moveSkipLinkNavigationIn();
- jQuery('.focus_box').removeClass('focus_box');
}
},
@@ -40,14 +50,6 @@ const SkipLinks = {
SkipLinks.navigationStatus = 2;
},
- getFragment: function() {
- var fragmentStart = document.location.hash.indexOf('#');
- if (fragmentStart < 0) {
- return '';
- }
- return document.location.hash.substring(fragmentStart);
- },
-
/**
* Inserts the list with skip links
*/
@@ -64,21 +66,20 @@ const SkipLinks = {
* sets the area (of the id) as the current area for tab-navigation
* and highlights it
*/
- setActiveTarget: function(id) {
+ setActiveTarget (id) {
var fragment = null;
// set active area only if skip links are activated
- if (!jQuery('*').is('#skip_link_navigation')) {
+ if (!document.getElementById('skip_link_navigation')) {
return false;
}
if (id) {
fragment = id;
} else {
- fragment = SkipLinks.getFragment();
+ fragment = document.location.hash;
}
- if (jQuery('*').is(fragment) && fragment.length > 0 && fragment !== SkipLinks.activeElement) {
+
+ if (fragment.length > 0 && isSelectorValid(fragment) && fragment !== SkipLinks.activeElement && document.querySelector(fragment)) {
SkipLinks.moveSkipLinkNavigationOut();
- jQuery('.focus_box').removeClass('focus_box');
- jQuery(fragment).addClass('focus_box');
if (jQuery(fragment).is(':focusable')) {
jQuery(fragment)
.click()
--
GitLab