Skip to content
Snippets Groups Projects
Commit 51a39fa2 authored by Daniel Speicher's avatar Daniel Speicher Committed by Sascha Eggenberger
Browse files

Issue #3460390: Ensure sidebarTrigger.nextSibling is not null when showing/hiding toolbar

parent 7109f850
No related branches found
No related tags found
2 merge requests!518Issue 3480661: Add padding to bottom of ckeditor content.,!228Issue #3342164: Remove implicit dependency on node module for gin content form
......@@ -33,9 +33,10 @@
const chooseStorage = window.innerWidth < 1024 ? "Drupal.gin.sidebarExpanded.mobile" : storageDesktop, hideLabel = Drupal.t("Hide sidebar panel"), sidebarTrigger = document.querySelector(".meta-sidebar__trigger");
var _Drupal$ginCoreNaviga;
if (sidebarTrigger.querySelector("span").innerHTML = hideLabel, sidebarTrigger.setAttribute("title", hideLabel),
sidebarTrigger.nextSibling.innerHTML = hideLabel, sidebarTrigger.setAttribute("aria-expanded", "true"),
sidebarTrigger.classList.add("is-active"), document.body.setAttribute("data-meta-sidebar", "open"),
localStorage.setItem(chooseStorage, "true"), window.innerWidth < 1280) if (null === (_Drupal$ginCoreNaviga = Drupal.ginCoreNavigation) || void 0 === _Drupal$ginCoreNaviga || _Drupal$ginCoreNaviga.collapseToolbar(),
sidebarTrigger.nextSibling && (sidebarTrigger.nextSibling.innerHTML = hideLabel),
sidebarTrigger.setAttribute("aria-expanded", "true"), sidebarTrigger.classList.add("is-active"),
document.body.setAttribute("data-meta-sidebar", "open"), localStorage.setItem(chooseStorage, "true"),
window.innerWidth < 1280) if (null === (_Drupal$ginCoreNaviga = Drupal.ginCoreNavigation) || void 0 === _Drupal$ginCoreNaviga || _Drupal$ginCoreNaviga.collapseToolbar(),
"vertical" === toolbarVariant) Drupal.ginToolbar.collapseToolbar(); else if ("new" === toolbarVariant) {
var _Drupal$behaviors$gin;
null === (_Drupal$behaviors$gin = Drupal.behaviors.ginNavigation) || void 0 === _Drupal$behaviors$gin || _Drupal$behaviors$gin.collapseSidebar();
......@@ -44,9 +45,9 @@
collapseSidebar: () => {
const chooseStorage = window.innerWidth < 1024 ? "Drupal.gin.sidebarExpanded.mobile" : storageDesktop, showLabel = Drupal.t("Show sidebar panel"), sidebarTrigger = document.querySelector(".meta-sidebar__trigger");
sidebarTrigger.querySelector("span").innerHTML = showLabel, sidebarTrigger.setAttribute("title", showLabel),
sidebarTrigger.nextSibling.innerHTML = showLabel, sidebarTrigger.setAttribute("aria-expanded", "false"),
sidebarTrigger.classList.remove("is-active"), document.body.setAttribute("data-meta-sidebar", "closed"),
localStorage.setItem(chooseStorage, "false");
sidebarTrigger.nextSibling && (sidebarTrigger.nextSibling.innerHTML = showLabel),
sidebarTrigger.setAttribute("aria-expanded", "false"), sidebarTrigger.classList.remove("is-active"),
document.body.setAttribute("data-meta-sidebar", "closed"), localStorage.setItem(chooseStorage, "false");
},
handleResize: function() {
let windowSize = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : window;
......
......@@ -90,7 +90,9 @@
sidebarTrigger.querySelector('span').innerHTML = hideLabel;
sidebarTrigger.setAttribute('title', hideLabel);
sidebarTrigger.nextSibling.innerHTML = hideLabel;
if (sidebarTrigger.nextSibling) {
sidebarTrigger.nextSibling.innerHTML = hideLabel;
}
sidebarTrigger.setAttribute('aria-expanded', 'true');
sidebarTrigger.classList.add('is-active');
......@@ -118,7 +120,9 @@
sidebarTrigger.querySelector('span').innerHTML = showLabel;
sidebarTrigger.setAttribute('title', showLabel);
sidebarTrigger.nextSibling.innerHTML = showLabel;
if (sidebarTrigger.nextSibling) {
sidebarTrigger.nextSibling.innerHTML = showLabel;
}
sidebarTrigger.setAttribute('aria-expanded', 'false');
sidebarTrigger.classList.remove('is-active');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment