Merge remote-tracking branch 'origin/develop' into optimize
This commit is contained in:
commit
3bf558089f
11 changed files with 39 additions and 5 deletions
|
|
@ -263,6 +263,11 @@
|
|||
{{ $t('settings.hide_wallpaper') }}
|
||||
</BooleanSetting>
|
||||
</li>
|
||||
<li>
|
||||
<BooleanSetting path="allowForeignUserBackground">
|
||||
{{ $t('settings.foreign_user_background') }}
|
||||
</BooleanSetting>
|
||||
</li>
|
||||
<li>
|
||||
<BooleanSetting path="compactProfiles">
|
||||
{{ $t('settings.compact_profiles') }}
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ const Status = {
|
|||
},
|
||||
muteFilterHits() {
|
||||
return muteFilterHits(
|
||||
Object.values(useSyncConfigStore().prefsStorage.simple.muteFilters),
|
||||
Object.values(useSyncConfigStore().prefsStorage.simple.muteFilters || {}),
|
||||
this.status,
|
||||
)
|
||||
},
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import withLoadMore from '../../hocs/with_load_more/with_load_more'
|
|||
|
||||
import { useInstanceStore } from 'src/stores/instance.js'
|
||||
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
|
||||
import { useInterfaceStore } from 'src/stores/interface.js'
|
||||
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
||||
|
||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||
|
|
@ -55,9 +56,14 @@ const UserProfile = {
|
|||
const routeParams = this.$route.params
|
||||
this.load({ name: routeParams.name, id: routeParams.id })
|
||||
this.tab = get(this.$route, 'query.tab', defaultTabKey)
|
||||
useInterfaceStore().setForeignProfileBackground(this.user?.background_image)
|
||||
},
|
||||
updated() {
|
||||
useInterfaceStore().setForeignProfileBackground(this.user?.background_image)
|
||||
},
|
||||
unmounted() {
|
||||
this.stopFetching()
|
||||
useInterfaceStore().setForeignProfileBackground(null)
|
||||
},
|
||||
computed: {
|
||||
timeline() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue