From 0964e1f8ae956dc03ab2050bb85272eeb005220a Mon Sep 17 00:00:00 2001 From: Peter Mosses <18308236+pdmosses@users.noreply.github.com> Date: Wed, 6 Sep 2023 22:20:26 +0200 Subject: [PATCH] Remove the `passive` toggle (#1335) * Remove "passive" toggle PR #1244 introduced the "passive" toggle, but just-the-docs.js subsequently disabled the only styling that used it, so it became redundant. This removes it. * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Matt Wang * Update CHANGELOG.md Co-authored-by: Matt Wang --------- Co-authored-by: Matt Wang --- CHANGELOG.md | 2 ++ _includes/css/activation.scss.liquid | 9 ++++----- assets/js/just-the-docs.js | 19 ++----------------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4900381..6c1ca79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,8 +17,10 @@ This website is built from the `HEAD` of the `main` branch of the theme reposito Code changes to `main` that are *not* in the latest release: +- Remove: unused `.passive` toggle in navigation by [@pdmosses] in [#1335] - Fixed: Windows emoji font fallback by [@flanakin] in [#1337] +[#1335]: https://github.com/just-the-docs/just-the-docs/pull/1335 [#1337]: https://github.com/just-the-docs/just-the-docs/pull/1337 ### New Contributors diff --git a/_includes/css/activation.scss.liquid b/_includes/css/activation.scss.liquid index 524ab07..055a763 100644 --- a/_includes/css/activation.scss.liquid +++ b/_includes/css/activation.scss.liquid @@ -134,11 +134,10 @@ } } -// Styling for nav-list-expanders at first and second levels, -// suppressed when a click has deactivated the expander (making the nav-list-item .passive): +// Styling for nav-list-expanders at first and second levels: {{ activation_collection_prefix }} { - > .nav-list-item:not(.passive):nth-child({{ activation_first_level_index }}){%- if activation_second_level_index %}, - > .nav-list-item:not(.passive):nth-child({{ activation_first_level_index }}) > .nav-list > .nav-list-item:not(.passive):nth-child({{ activation_second_level_index }}){% endif %} { + > .nav-list-item:nth-child({{ activation_first_level_index }}){%- if activation_second_level_index %}, + > .nav-list-item:nth-child({{ activation_first_level_index }}) > .nav-list > .nav-list-item:nth-child({{ activation_second_level_index }}){% endif %} { > .nav-list-expander svg { @if $nav-list-expander-right { transform: rotate(-90deg); @@ -154,7 +153,7 @@ } // Styling for nav-list-expander for categories: -.site-nav > .nav-category-list > .nav-list-item:not(.passive) { +.site-nav > .nav-category-list > .nav-list-item { > .nav-list-expander svg { @if $nav-list-expander-right { transform: rotate(-90deg); diff --git a/assets/js/just-the-docs.js b/assets/js/just-the-docs.js index 0835d66..fb924de 100644 --- a/assets/js/just-the-docs.js +++ b/assets/js/just-the-docs.js @@ -31,10 +31,7 @@ function initNav() { } if (target) { e.preventDefault(); - const active = target.parentNode.classList.toggle('active'); - const passive = target.parentNode.classList.toggle('passive'); - if (active && passive) target.parentNode.classList.toggle('passive'); - target.ariaPressed = active; + target.ariaPressed = target.parentNode.classList.toggle('active'); } }); @@ -498,8 +495,7 @@ function scrollNav() { } // Find the nav-list-link that refers to the current page -// then make it and all enclosing nav-list-item elements active, -// and make all other folded collections passive +// then make it and all enclosing nav-list-item elements active. function activateNav() { var target = navLink(); @@ -515,17 +511,6 @@ function activateNav() { target = target.parentNode; } } - const elements = document.getElementsByClassName("nav-category-list"); - for (const element of elements) { - const item = element.children[0]; - const active = item.classList.toggle('active'); - if (active) { - item.classList.toggle('active', false); - item.classList.toggle('passive', true); - } else { - item.classList.toggle('active', true); - } - } } // Document ready