Merge pull request #2275 from nextcloud/fix/41900-fix-description-for…

…-favorite-images fix(files): Fix description for favorite images and remove image description
nextcloud · Jan 23, 2024 · b37af9e · b37af9e
2 parents 48b3e4a + 6360bda
commit b37af9e
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 39 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js b/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js
diff --git a/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js.map b/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js.map
diff --git a/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js b/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js
diff --git a/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js.map b/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js.map
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-934ab5.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-934ab5.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-934ab5.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-934ab5.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js b/js/photos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js
diff --git a/...tos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js.map b/...tos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js.map
diff --git a/...rtControllerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js b/...rtControllerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js
diff --git a/...ntrollerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js.map b/...ntrollerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js.map
diff --git a/js/photos-src_views_FaceContent_vue.js b/js/photos-src_views_FaceContent_vue.js
diff --git a/js/photos-src_views_FaceContent_vue.js.map b/js/photos-src_views_FaceContent_vue.js.map
diff --git a/src/components/File.vue b/src/components/File.vue
@@ -46,7 +46,6 @@
 						:key="`${file.basename}-small`"
 						:src="srcSmall"
 						:alt="file.basename"
-						:aria-describedby="ariaDescription"
 						:decoding="loadedSmall || isVisible ? 'sync' : 'async'"
 						:fetchpriority="loadedSmall || isVisible ? 'high' : 'low'"
 						:loading="loadedSmall || isVisible ? 'eager' : distance < 2 ? 'auto' : 'lazy'"
@@ -61,14 +60,10 @@
 						:decoding="loadedLarge || isVisible ? 'sync' : 'async'"
 						:fetchpriority="loadedLarge || isVisible ? 'high' : 'low'"
 						:loading="loadedLarge || isVisible ? 'auto' : 'lazy'"
-						:aria-describedby="ariaDescription"
 						@load="onLoadLarge"
 						@error="onErrorLarge">
 				</template>
 			</div>
-
-			<!-- image description -->
-			<p :id="ariaDescription" class="file__hidden-description" :class="{show: errorSmall && errorLarge}">{{ file.basename }}</p>
 		</a>
 
 		<NcCheckboxRadioSwitch v-if="allowSelection"
@@ -133,12 +128,11 @@ export default {
 	},
 
 	computed: {
-		/** @return {string} */
-		ariaDescription() {
-			return `image-description-${this.file.fileid}`
-		},
 		/** @return {string} */
 		ariaLabel() {
+			if (this.file.favorite) {
+				return t('photos', 'Favorite image, open the full size "{name}" image', { name: this.file.basename })
+			}
 			return t('photos', 'Open the full size "{name}" image', { name: this.file.basename })
 		},
 		/** @return {boolean} */