hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'timeline-view-menu' into shigusegubu-vue3

Browse source 
* timeline-view-menu:
  fix bugs
  Apply 1 suggestion(s) to 1 file(s)
This commit is contained in:
Henry Jameson 2022-08-04 23:33:47 +03:00
commit f39563bdc5
2 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/quick_view_settings/quick_view_settings.js
View file

@ -1,12 +1,12 @@
import Popover from '../popover/popover.vue' import Popover from '../popover/popover.vue'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { library } from '@fortawesome/fontawesome-svg-core' import { library } from '@fortawesome/fontawesome-svg-core'
import { faList, faFolderTree, faBarsStaggered, faWrench } from '@fortawesome/free-solid-svg-icons' import { faList, faFolderTree, faBars, faWrench } from '@fortawesome/free-solid-svg-icons'
library.add( library.add(
faList, faList,
faFolderTree, faFolderTree,
faBarsStaggered, faBars,
faWrench faWrench
) )
@ -20,7 +20,6 @@ const QuickViewSettings = {
methods: { methods: {
setConversationDisplay (visibility) { setConversationDisplay (visibility) {
this.$store.dispatch('setOption', { name: 'conversationDisplay', value: visibility }) this.$store.dispatch('setOption', { name: 'conversationDisplay', value: visibility })
this.$store.dispatch('queueFlushAll')
}, },
openTab (tab) { openTab (tab) {
this.$store.dispatch('openSettingsModalTab', tab) this.$store.dispatch('openSettingsModalTab', tab)
@ -52,7 +51,8 @@ const QuickViewSettings = {
showUserAvatars: { showUserAvatars: {
get () { return this.mergedConfig.mentionLinkShowAvatar }, get () { return this.mergedConfig.mentionLinkShowAvatar },
set () { set () {
const value = !this.mentionLinkShowAvatar const value = !this.showUserAvatars
console.log(value)
this.$store.dispatch('setOption', { name: 'mentionLinkShowAvatar', value }) this.$store.dispatch('setOption', { name: 'mentionLinkShowAvatar', value })
} }
}, },

4
src/components/quick_view_settings/quick_view_settings.vue
View file

@ -6,7 +6,6 @@
> >
<template #content> <template #content>
<div class="dropdown-menu"> <div class="dropdown-menu">
<div v-if="loggedIn">
<button <button
class="button-default dropdown-item" class="button-default dropdown-item"
@click="conversationDisplay = 'tree'" @click="conversationDisplay = 'tree'"
@ -29,7 +28,6 @@
role="separator" role="separator"
class="dropdown-divider" class="dropdown-divider"
/> />
</div>
<button <button
class="button-default dropdown-item" class="button-default dropdown-item"
@click="showUserAvatars = !showUserAvatars" @click="showUserAvatars = !showUserAvatars"
@ -69,7 +67,7 @@
</template> </template>
<template #trigger> <template #trigger>
<button class="button-unstyled"> <button class="button-unstyled">
<FAIcon icon="bars-staggered" /> <FAIcon icon="bars" />
</button> </button>
</template> </template>
</Popover> </Popover>