From 39de46de943edf0855e76d35b9f20e5be62f26a6 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Thu, 4 Nov 2021 16:40:41 -0300 Subject: [PATCH] Adds arial label to all modal close buttons due to Buefy new feature. --- package-lock.json | 9 +++++---- package.json | 2 +- src/views/admin/admin.vue | 3 ++- .../edition/importer-mapping-form.vue | 4 +++- .../edition/item-bulk-edition-form.vue | 6 ++++-- .../components/edition/item-edition-form.vue | 18 ++++++++++++------ .../edition/taxonomy-edition-form.vue | 6 ++++-- .../filter-types/checkbox/Checkbox.vue | 3 ++- .../filter-types/taxonomy/Checkbox.vue | 3 ++- .../admin/components/lists/activities-list.vue | 3 ++- .../admin/components/lists/basic-term-item.vue | 6 ++++-- .../components/lists/capabilities-list.vue | 3 ++- .../components/lists/collections-list.vue | 6 ++++-- .../admin/components/lists/items-list.vue | 18 ++++++++++++------ .../components/lists/metadata-mapping-list.vue | 3 ++- .../admin/components/lists/processes-list.vue | 6 ++++-- .../components/lists/recursive-term-item.vue | 6 ++++-- .../components/lists/related-items-list.vue | 3 ++- .../admin/components/lists/taxonomies-list.vue | 6 ++++-- .../compound/child-metadata-list.vue | 6 ++++-- .../relationship/Relationship.vue | 3 ++- .../metadata-types/taxonomy/Taxonomy.vue | 3 ++- .../tainacan-repository-subheader.vue | 3 ++- .../admin/components/other/document-item.vue | 3 ++- src/views/admin/components/other/file-item.vue | 3 ++- .../components/other/item-copy-dialog.vue | 3 ++- src/views/admin/js/axios.js | 3 ++- .../admin/pages/lists/collections-page.vue | 3 ++- src/views/admin/pages/lists/filters-page.vue | 6 ++++-- src/views/admin/pages/lists/items-page.vue | 15 ++++++++++----- src/views/admin/pages/lists/metadata-page.vue | 6 ++++-- src/views/admin/pages/singles/item-page.vue | 3 ++- .../components/view-mode-slideshow.vue | 1 + .../theme-search/theme-items-page.vue | 9 ++++++--- 34 files changed, 122 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac0b15d28..73ce35aa2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2428,9 +2428,9 @@ } }, "buefy": { - "version": "0.9.10", - "resolved": "https://registry.npmjs.org/buefy/-/buefy-0.9.10.tgz", - "integrity": "sha512-xXEoy/NTgBNiIfBTCdHi2Vu5SJJdB046py6ekUvYuUgYwRvulySZksdecVNNWdfEVU8iD4esZaRbTLwCegFcVQ==", + "version": "0.9.11", + "resolved": "https://registry.npmjs.org/buefy/-/buefy-0.9.11.tgz", + "integrity": "sha512-WP32SiaM9WVxDtzgdiq7V2zyIvn41NboPgluVqdB6OAi1/QhjO/63m6hd/jy6Vk8r+zuhIZD+aP9KlQ10EhxTQ==", "requires": { "bulma": "0.9.3" } @@ -4891,7 +4891,8 @@ }, "ini": { "version": "1.3.5", - "resolved": "", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, diff --git a/package.json b/package.json index da8c9600c..db83050c5 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "apexcharts": "^3.29.0", "axios": "^0.21.4", "blurhash": "^1.1.3", - "buefy": "^0.9.10", + "buefy": "^0.9.11", "bulma": "^0.9.3", "conditioner-core": "^2.3.3", "countup.js": "^2.0.8", diff --git a/src/views/admin/admin.vue b/src/views/admin/admin.vue index f622a8698..753eef17e 100644 --- a/src/views/admin/admin.vue +++ b/src/views/admin/admin.vue @@ -111,7 +111,8 @@ }, ariaRole: 'alertdialog', ariaModal: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } }); diff --git a/src/views/admin/components/edition/importer-mapping-form.vue b/src/views/admin/components/edition/importer-mapping-form.vue index 667b29475..e9f16eff0 100644 --- a/src/views/admin/components/edition/importer-mapping-form.vue +++ b/src/views/admin/components/edition/importer-mapping-form.vue @@ -209,6 +209,7 @@ trap-focus aria-modal aria-role="dialog" + :close-button-aria-label="$i18n.get('close')" custom-class="tainacan-modal">
+ custom-class="tainacan-modal" + :close-button-aria-label="$i18n.get('close')">

{{ $i18n.get('label_thumbnail_alt') }}

@@ -593,7 +594,8 @@ trap-focus aria-modal aria-role="dialog" - custom-class="tainacan-modal"> + custom-class="tainacan-modal" + :close-button-aria-label="$i18n.get('close')">

{{ $i18n.get('instruction_write_text') }}

@@ -635,7 +637,8 @@ tabindex="-1" aria-modal aria-role="dialog" - custom-class="tainacan-modal"> + custom-class="tainacan-modal" + :close-button-aria-label="$i18n.get('close')">

{{ $i18n.get('instruction_insert_url') }}

@@ -1174,7 +1177,8 @@ export default { }, }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } else { next() @@ -1558,7 +1562,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, @@ -1681,7 +1686,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, loadExistingItem() { diff --git a/src/views/admin/components/edition/taxonomy-edition-form.vue b/src/views/admin/components/edition/taxonomy-edition-form.vue index d3a9e8803..90a050915 100644 --- a/src/views/admin/components/edition/taxonomy-edition-form.vue +++ b/src/views/admin/components/edition/taxonomy-edition-form.vue @@ -300,7 +300,8 @@ } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } else if (this.isEditingTerm) { this.$buefy.modal.open({ @@ -315,7 +316,8 @@ } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } else { next(); diff --git a/src/views/admin/components/filter-types/checkbox/Checkbox.vue b/src/views/admin/components/filter-types/checkbox/Checkbox.vue index 584b24e1d..415a1dcc2 100644 --- a/src/views/admin/components/filter-types/checkbox/Checkbox.vue +++ b/src/views/admin/components/filter-types/checkbox/Checkbox.vue @@ -206,7 +206,8 @@ } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, } diff --git a/src/views/admin/components/filter-types/taxonomy/Checkbox.vue b/src/views/admin/components/filter-types/taxonomy/Checkbox.vue index 6629cadd8..268a16c49 100644 --- a/src/views/admin/components/filter-types/taxonomy/Checkbox.vue +++ b/src/views/admin/components/filter-types/taxonomy/Checkbox.vue @@ -320,7 +320,8 @@ }, width: 'calc(100% - (4 * var(--tainacan-one-column)))', trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, prepareOptionsForTaxonomy(items) { diff --git a/src/views/admin/components/lists/activities-list.vue b/src/views/admin/components/lists/activities-list.vue index 9c70cc972..a9e287994 100644 --- a/src/views/admin/components/lists/activities-list.vue +++ b/src/views/admin/components/lists/activities-list.vue @@ -184,7 +184,8 @@ notApproveActivity: (activityId) => this.notApproveActivity(activityId) }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, } diff --git a/src/views/admin/components/lists/basic-term-item.vue b/src/views/admin/components/lists/basic-term-item.vue index 1ea215962..290486a4f 100644 --- a/src/views/admin/components/lists/basic-term-item.vue +++ b/src/views/admin/components/lists/basic-term-item.vue @@ -104,7 +104,8 @@ export default { onConfirm: () => { this.removeTerm(); }, }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } else { this.removeTerm(); @@ -126,7 +127,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, eventOnEditTerm() { diff --git a/src/views/admin/components/lists/capabilities-list.vue b/src/views/admin/components/lists/capabilities-list.vue index eced0817c..d6d0e8aa3 100644 --- a/src/views/admin/components/lists/capabilities-list.vue +++ b/src/views/admin/components/lists/capabilities-list.vue @@ -144,7 +144,8 @@ capabilityKey: capabilityKey }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, getCompleteRolesList(roles, rolesInherited) { diff --git a/src/views/admin/components/lists/collections-list.vue b/src/views/admin/components/lists/collections-list.vue index ca963c583..b601e23d4 100644 --- a/src/views/admin/components/lists/collections-list.vue +++ b/src/views/admin/components/lists/collections-list.vue @@ -448,7 +448,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); this.clearContextMenu(); }, @@ -489,7 +490,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, openCollection() { diff --git a/src/views/admin/components/lists/items-list.vue b/src/views/admin/components/lists/items-list.vue index 05071adae..22955fa62 100644 --- a/src/views/admin/components/lists/items-list.vue +++ b/src/views/admin/components/lists/items-list.vue @@ -1447,7 +1447,8 @@ export default { }, width: 'calc(100% - (2 * var(--tainacan-one-column)))', trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, sequenceEditSelectedItems() { @@ -1486,7 +1487,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); this.clearContextMenu(); @@ -1519,7 +1521,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, deleteOneItem(itemId) { @@ -1543,7 +1546,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); this.clearContextMenu(); }, @@ -1576,7 +1580,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, deleteSelectedItems() { @@ -1618,7 +1623,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, openItem() { diff --git a/src/views/admin/components/lists/metadata-mapping-list.vue b/src/views/admin/components/lists/metadata-mapping-list.vue index efec94a50..f54d74658 100644 --- a/src/views/admin/components/lists/metadata-mapping-list.vue +++ b/src/views/admin/components/lists/metadata-mapping-list.vue @@ -151,7 +151,8 @@ trap-focus aria-modal aria-role="dialog" - custom-class="tainacan-modal"> + custom-class="tainacan-modal" + :close-button-aria-label="$i18n.get('close')">
{ this.removeTerm(); }, }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } else { this.removeTerm(); @@ -279,7 +280,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, eventOnChildTermDeleted(parentTermId) { diff --git a/src/views/admin/components/lists/related-items-list.vue b/src/views/admin/components/lists/related-items-list.vue index 897dc8822..609f2063a 100644 --- a/src/views/admin/components/lists/related-items-list.vue +++ b/src/views/admin/components/lists/related-items-list.vue @@ -132,7 +132,8 @@ :width="1200" :active.sync="editItemModal" @close="reloadRelatedItems" - custom-class="tainacan-modal"> + custom-class="tainacan-modal" + :close-button-aria-label="$i18n.get('close')">