lint
This commit is contained in:
parent
c1c285a1b9
commit
3f2ce5e7ab
5 changed files with 13 additions and 6 deletions
11
src/App.js
11
src/App.js
|
|
@ -150,7 +150,10 @@ export default {
|
|||
return this.currentUser.background_image
|
||||
},
|
||||
foreignProfileBackground() {
|
||||
return useMergedConfigStore().mergedConfig.allowForeignUserBackground && useInterfaceStore().foreignProfileBackground
|
||||
return (
|
||||
useMergedConfigStore().mergedConfig.allowForeignUserBackground &&
|
||||
useInterfaceStore().foreignProfileBackground
|
||||
)
|
||||
},
|
||||
instanceBackground() {
|
||||
return useMergedConfigStore().mergedConfig.hideInstanceWallpaper
|
||||
|
|
@ -158,7 +161,11 @@ export default {
|
|||
: this.instanceBackgroundUrl
|
||||
},
|
||||
background() {
|
||||
return this.foreignProfileBackground || this.userBackground || this.instanceBackground
|
||||
return (
|
||||
this.foreignProfileBackground ||
|
||||
this.userBackground ||
|
||||
this.instanceBackground
|
||||
)
|
||||
},
|
||||
bgStyle() {
|
||||
if (this.background) {
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
:button="button"
|
||||
:status="status"
|
||||
v-bind="$attrs"
|
||||
@emojiPickerShown="e => $emit('emojiPickerShown', e)"
|
||||
@emoji-picker-shown="e => $emit('emojiPickerShown', e)"
|
||||
/>
|
||||
<teleport to="#modal">
|
||||
<MuteConfirm
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
:get-component="getComponent"
|
||||
:close="() => { /* no-op */ }"
|
||||
:do-action="doAction"
|
||||
@emojiPickerShown="onEmojiPickerShown"
|
||||
@emoji-picker-shown="onEmojiPickerShown"
|
||||
/>
|
||||
<button
|
||||
v-if="showPin && currentUser"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ import Timeline from '../timeline/timeline.vue'
|
|||
import UserCard from '../user_card/user_card.vue'
|
||||
|
||||
import { useInstanceStore } from 'src/stores/instance.js'
|
||||
import { useInterfaceStore } from 'src/stores/interface.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'
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ export const INSTANCE_DEFAULT_CONFIG_DEFINITIONS = {
|
|||
default: false,
|
||||
},
|
||||
allowForeignUserBackground: {
|
||||
description: 'Allow other user\'s profiles to override wallpaper',
|
||||
description: "Allow other user's profiles to override wallpaper",
|
||||
default: true,
|
||||
},
|
||||
hideInstanceWallpaper: {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue