diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-22 22:34:38 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-22 22:34:38 +0000 |
| commit | 91422367d35372bd5977a5c091c80647e2628f6e (patch) | |
| tree | e0d102a21b4a62aab390617b2b217341cb969e3d /src/components/user_popover | |
| parent | 88a3cf8705f925c31b5fad67d0fb709a51447156 (diff) | |
| parent | 272b748f26d0bb7b9f3a00336a908d507f4169bc (diff) | |
Merge branch 'allow-opening-profile-in-user-popover' into 'develop'
Allow opening profile in user popover when clicking on avatar
See merge request pleroma/pleroma-fe!1586
Diffstat (limited to 'src/components/user_popover')
| -rw-r--r-- | src/components/user_popover/user_popover.js | 4 | ||||
| -rw-r--r-- | src/components/user_popover/user_popover.vue | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/components/user_popover/user_popover.js b/src/components/user_popover/user_popover.js index 69b25383..3b12aa1e 100644 --- a/src/components/user_popover/user_popover.js +++ b/src/components/user_popover/user_popover.js @@ -11,8 +11,8 @@ const UserPopover = { Popover: defineAsyncComponent(() => import('../popover/popover.vue')) }, computed: { - userPopoverZoom () { - return this.$store.getters.mergedConfig.userPopoverZoom + userPopoverAvatarAction () { + return this.$store.getters.mergedConfig.userPopoverAvatarAction }, userPopoverOverlay () { return this.$store.getters.mergedConfig.userPopoverOverlay diff --git a/src/components/user_popover/user_popover.vue b/src/components/user_popover/user_popover.vue index 4e999672..53d51fc4 100644 --- a/src/components/user_popover/user_popover.vue +++ b/src/components/user_popover/user_popover.vue @@ -14,7 +14,7 @@ class="user-popover" :user-id="userId" :hide-bio="true" - :avatar-action="userPopoverZoom ? 'zoom' : close" + :avatar-action="userPopoverAvatarAction == 'close' ? close : userPopoverAvatarAction" :on-close="close" /> </template> |