Skip to content

Commit dfaa94d

Browse files
author
Nicolas AMBROISE
committed
Remove double vocalization + Initialize indicators
1 parent 4bcb288 commit dfaa94d

File tree

1 file changed

+18
-17
lines changed
  • content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel

1 file changed

+18
-17
lines changed

content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel/carousel.html

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,30 @@
1919
data-panelcontainer="${wcmmode.edit && 'carousel'}"
2020
id="${carousel.id}"
2121
class="cmp-carousel"
22-
role="group"
22+
role="region"
2323
aria-label="${carousel.accessibilityLabel}"
24-
aria-live="polite"
2524
aria-roledescription="carousel"
2625
data-cmp-is="carousel"
2726
data-cmp-autoplay="${(wcmmode.edit || wcmmode.preview) ? '' : carousel.autoplay}"
2827
data-cmp-delay="${carousel.delay}"
2928
data-cmp-autopause-disabled="${carousel.autopauseDisabled}"
3029
data-cmp-data-layer="${carousel.data.json}"
3130
data-placeholder-text="${wcmmode.edit && 'Please add Carousel components here' @ i18n}">
32-
<sly data-sly-call="${controlsTemplate.controls @ carousel=carousel}" data-sly-test="${carousel.controlsPrepended}"></sly>
31+
<sly data-sly-call="${controlsTemplate.controls @ carousel=carousel}" data-sly-test="${carousel.controlsPrepended}"></sly>
32+
<ol class="cmp-carousel__indicators"
33+
role="tablist"
34+
aria-label="${carousel.accessibilityTablist || 'Choose a slide to display' @ i18n}"
35+
data-cmp-hook-carousel="indicators">
36+
<li data-sly-repeat.item="${items}"
37+
id="${item.id}-tab"
38+
class="cmp-carousel__indicator${item.name == carousel.activeItem ? ' cmp-carousel__indicator--active' : ''}"
39+
role="tab"
40+
aria-controls="${item.id}-tabpanel"
41+
title="${'Slide {0}' @ format=[itemList.count], i18n}"
42+
data-cmp-hook-carousel="indicator"
43+
aria-selected="${item.name == carousel.activeItem ? true : false}"
44+
tabindex="${item.name == carousel.activeItem ? '0' : '-1'}">${'Slide {0}' @ format=[itemList.count], i18n}</li>
45+
</ol>
3346
<div data-sly-set.items="${carousel.children || carousel.items}"
3447
data-sly-test="${items && items.size > 0}"
3548
class="cmp-carousel__content"
@@ -40,24 +53,12 @@
4053
id="${item.id}-tabpanel"
4154
class="cmp-carousel__item${item.name == carousel.activeItem ? ' cmp-carousel__item--active' : ''}"
4255
role="tabpanel"
43-
aria-labelledby="${item.id}-tab"
4456
aria-roledescription="slide"
4557
aria-label="${(carousel.accessibilityAutoItemTitles && item.title) || 'Slide {0} of {1}' @ format=[itemList.count, carousel.items.size], i18n}"
4658
data-cmp-data-layer="${item.data.json}"
47-
data-cmp-hook-carousel="item"></div>
59+
data-cmp-hook-carousel="item"
60+
tabindex="-1"></div>
4861
<sly data-sly-call="${controlsTemplate.controls @ carousel=carousel}" data-sly-test="${!carousel.controlsPrepended}"></sly>
49-
<ol class="cmp-carousel__indicators"
50-
role="tablist"
51-
aria-label="${carousel.accessibilityTablist || 'Choose a slide to display' @ i18n}"
52-
data-cmp-hook-carousel="indicators">
53-
<li data-sly-repeat.item="${items}"
54-
id="${item.id}-tab"
55-
class="cmp-carousel__indicator${item.name == carousel.activeItem ? ' cmp-carousel__indicator--active' : ''}"
56-
role="tab"
57-
aria-controls="${item.id}-tabpanel"
58-
aria-label="${'Slide {0}' @ format=[itemList.count], i18n}"
59-
data-cmp-hook-carousel="indicator">${item.title}</li>
60-
</ol>
6162
</div>
6263
<sly data-sly-resource="${resource.path @ resourceType='wcm/foundation/components/parsys/newpar', appendPath='/*', decorationTagName='div', cssClassName='new section aem-Grid-newComponent'}"
6364
data-sly-test="${(wcmmode.edit || wcmmode.preview) && items.size < 1}"></sly>

0 commit comments

Comments
 (0)