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
This commit is contained in:
commit
91422367d3
|
@ -44,6 +44,11 @@ const GeneralTab = {
|
|||
value: mode,
|
||||
label: this.$t(`settings.third_column_mode_${mode}`)
|
||||
})),
|
||||
userPopoverAvatarActionOptions: ['close', 'zoom', 'open'].map(mode => ({
|
||||
key: mode,
|
||||
value: mode,
|
||||
label: this.$t(`settings.user_popover_avatar_action_${mode}`)
|
||||
})),
|
||||
loopSilentAvailable:
|
||||
// Firefox
|
||||
Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||
|
||||
|
|
|
@ -60,12 +60,14 @@
|
|||
</BooleanSetting>
|
||||
</li>
|
||||
<li>
|
||||
<BooleanSetting
|
||||
path="userPopoverZoom"
|
||||
<ChoiceSetting
|
||||
id="userPopoverAvatarAction"
|
||||
path="userPopoverAvatarAction"
|
||||
:options="userPopoverAvatarActionOptions"
|
||||
expert="1"
|
||||
>
|
||||
{{ $t('settings.user_popover_avatar_zoom') }}
|
||||
</BooleanSetting>
|
||||
{{ $t('settings.user_popover_avatar_action') }}
|
||||
</ChoiceSetting>
|
||||
</li>
|
||||
<li>
|
||||
<BooleanSetting
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -579,7 +579,10 @@
|
|||
"mention_link_show_avatar_quick": "Show user avatar next to mentions",
|
||||
"mention_link_fade_domain": "Fade domains (e.g. {'@'}example.org in {'@'}foo{'@'}example.org)",
|
||||
"mention_link_bolden_you": "Highlight mention of you when you are mentioned",
|
||||
"user_popover_avatar_zoom": "Clicking on user avatar in popover zooms it instead of closing the popover",
|
||||
"user_popover_avatar_action": "Popover avatar click action",
|
||||
"user_popover_avatar_action_zoom": "Zoom the avatar",
|
||||
"user_popover_avatar_action_close": "Close the popover",
|
||||
"user_popover_avatar_action_open": "Open profile",
|
||||
"user_popover_avatar_overlay": "Show user popover over user avatar",
|
||||
"fun": "Fun",
|
||||
"greentext": "Meme arrows",
|
||||
|
|
|
@ -17,7 +17,8 @@ export const multiChoiceProperties = [
|
|||
'subjectLineBehavior',
|
||||
'conversationDisplay', // tree | linear
|
||||
'conversationOtherRepliesButton', // below | inside
|
||||
'mentionLinkDisplay' // short | full_for_remote | full
|
||||
'mentionLinkDisplay', // short | full_for_remote | full
|
||||
'userPopoverAvatarAction' // close | zoom | open
|
||||
]
|
||||
|
||||
export const defaultState = {
|
||||
|
@ -82,7 +83,7 @@ export const defaultState = {
|
|||
useContainFit: true,
|
||||
disableStickyHeaders: false,
|
||||
showScrollbars: false,
|
||||
userPopoverZoom: false,
|
||||
userPopoverAvatarAction: 'close',
|
||||
userPopoverOverlay: true,
|
||||
sidebarColumnWidth: '25rem',
|
||||
contentColumnWidth: '45rem',
|
||||
|
|
Loading…
Reference in New Issue