Merge pull request #36896 from nextcloud/backport/36358/stable25

[stable25] Adapt native tooltip for new structure of NcAvatar
nextcloud · Mar 9, 2023 · 3cfa52c · 3cfa52c
2 parents 233c22d + 8fb844d
commit 3cfa52c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue
@@ -25,7 +25,7 @@
 		<NcAvatar class="sharing-entry__avatar"
 			:is-no-user="share.type !== SHARE_TYPES.SHARE_TYPE_USER"
 			:user="share.shareWith"
-			:title="share.type === SHARE_TYPES.SHARE_TYPE_USER ? share.shareWithDisplayName : ''"
+			:display-name="share.shareWithDisplayName"
 			:menu-position="'left'"
 			:url="share.shareWithAvatar" />
 

diff --git a/apps/files_sharing/src/components/SharingEntryInherited.vue b/apps/files_sharing/src/components/SharingEntryInherited.vue
@@ -26,8 +26,7 @@
 		:title="share.shareWithDisplayName">
 		<template #avatar>
 			<NcAvatar :user="share.shareWith"
-				:aria-label="share.shareWithDisplayName"
-				:title="share.shareWithDisplayName"
+				:display-name="share.shareWithDisplayName"
 				class="sharing-entry__avatar" />
 		</template>
 		<NcActionText icon="icon-user">

diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
@@ -34,7 +34,7 @@
 			<SharingEntrySimple v-if="isSharedWithMe" v-bind="sharedWithMe" class="sharing-entry__reshare">
 				<template #avatar>
 					<NcAvatar :user="sharedWithMe.user"
-						:title="sharedWithMe.displayName"
+						:display-name="sharedWithMe.displayName"
 						class="sharing-entry__avatar" />
 				</template>
 			</SharingEntrySimple>

diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map