Skip to content

Commit

Permalink
Merge pull request #36896 from nextcloud/backport/36358/stable25
Browse files Browse the repository at this point in the history
[stable25] Adapt native tooltip for new structure of NcAvatar
  • Loading branch information
JuliaKirschenheuter authored Mar 9, 2023
2 parents 233c22d + 8fb844d commit 3cfa52c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion apps/files_sharing/src/components/SharingEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down
3 changes: 1 addition & 2 deletions apps/files_sharing/src/components/SharingEntryInherited.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/src/views/SharingTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map

Large diffs are not rendered by default.

0 comments on commit 3cfa52c

Please sign in to comment.