From 26ae3d6c91fc0349cb345a4f53724b70190ff5a3 Mon Sep 17 00:00:00 2001 From: Olivia206 <olivia.simonet@mmibordeaux.com> Date: Tue, 2 May 2023 11:10:30 +0200 Subject: [PATCH] cleaned js for modal --- assets/js/theme/design-system/modal.js | 8 +------- layouts/partials/volumes/volume.html | 6 +++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/assets/js/theme/design-system/modal.js b/assets/js/theme/design-system/modal.js index 335853d3..53d6f67c 100644 --- a/assets/js/theme/design-system/modal.js +++ b/assets/js/theme/design-system/modal.js @@ -36,7 +36,7 @@ class Modal { window.addEventListener('keydown', (event) => { if (event.keyCode === 27 || event.key === 'Escape') { this.toggle(false); - } else if (this.state.isOpened && event.key === "Tab") { + } else if (event.key === "Tab" && this.state.isOpened) { this.innerFocus(event); event.preventDefault(); } @@ -67,8 +67,6 @@ class Modal { else if (!this.element.contains(event.target)) { firstFocusable.focus(); } - - // this.closeButtons[0].focus(); firstFocusable.focus(); } @@ -78,10 +76,6 @@ class Modal { this.element.setAttribute('aria-hidden', !this.state.isOpened); document.documentElement.classList[classAction](CLASSES.modalOpened); - - // if (!this.state.isOpened) { - // this.button.focus(); - // } } } diff --git a/layouts/partials/volumes/volume.html b/layouts/partials/volumes/volume.html index cdb899dd..d6a49058 100644 --- a/layouts/partials/volumes/volume.html +++ b/layouts/partials/volumes/volume.html @@ -1,7 +1,7 @@ -<article class="volume"> +<article class="volume" itemscope itemtype="https://schema.org/Book https://schema.org/PublicationVolume"> <hgroup> - <p class="suptitle">{{ i18n "volumes.volume_number" (dict "Number" .Params.Number) }}</p> - <h2><a href="{{ .Permalink }}" title="{{ i18n "commons.more_aria" (dict "Title" .Title) }}">{{ partial "PrepareHTML" .Title }}</a></h2> + <p class="suptitle" itemprop="volumeNumber">{{ i18n "volumes.volume_number" (dict "Number" .Params.Number) }}</p> + <h2><a href="{{ .Permalink }}" title="{{ i18n "commons.more_aria" (dict "Title" .Title) }}" itemprop="name">{{ partial "PrepareHTML" .Title }}</a></h2> </hgroup> <div class="media"> {{- if .Params.image -}} -- GitLab