fix a lot of stuff by simply moving const to a proper place
This commit is contained in:
parent
12b4b00e49
commit
c2be818504
6 changed files with 10 additions and 15 deletions
|
|
@ -108,7 +108,7 @@ const MentionLink = {
|
||||||
return this.highlightData && '-' + this.highlightData.type
|
return this.highlightData && '-' + this.highlightData.type
|
||||||
},
|
},
|
||||||
highlightClass() {
|
highlightClass() {
|
||||||
return this.highlightData && highlightClass(this.user)
|
return this.highlightData && highlightClass(this.user)
|
||||||
},
|
},
|
||||||
style() {
|
style() {
|
||||||
if (this.highlightData) {
|
if (this.highlightData) {
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,10 @@ import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
|
||||||
import Popover from '../popover/popover.vue'
|
import Popover from '../popover/popover.vue'
|
||||||
|
|
||||||
import { useInterfaceStore } from 'src/stores/interface.js'
|
import { useInterfaceStore } from 'src/stores/interface.js'
|
||||||
import {
|
import { useLocalConfigStore } from 'src/stores/local_config.js'
|
||||||
LOCAL_ONLY_KEYS,
|
|
||||||
useLocalConfigStore,
|
|
||||||
} from 'src/stores/local_config.js'
|
|
||||||
import { useSyncConfigStore } from 'src/stores/sync_config.js'
|
import { useSyncConfigStore } from 'src/stores/sync_config.js'
|
||||||
|
|
||||||
|
import { LOCAL_ONLY_KEYS } from 'src/modules/default_config_state.js'
|
||||||
import {
|
import {
|
||||||
newExporter,
|
newExporter,
|
||||||
newImporter,
|
newImporter,
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ const FilteringTab = {
|
||||||
label: this.$t(`user_card.mute_block_${mode}`),
|
label: this.$t(`user_card.mute_block_${mode}`),
|
||||||
})),
|
})),
|
||||||
muteFiltersDraftObject: cloneDeep(
|
muteFiltersDraftObject: cloneDeep(
|
||||||
useSyncConfigStore().prefsStorage.simple.muteFilters,
|
useSyncConfigStore().mergedConfig.muteFilters,
|
||||||
),
|
),
|
||||||
muteFiltersDraftDirty: Object.fromEntries(
|
muteFiltersDraftDirty: Object.fromEntries(
|
||||||
Object.entries(
|
Object.entries(
|
||||||
|
|
@ -260,7 +260,7 @@ const FilteringTab = {
|
||||||
},
|
},
|
||||||
muteFiltersObject() {
|
muteFiltersObject() {
|
||||||
this.muteFiltersDraftObject = cloneDeep(
|
this.muteFiltersDraftObject = cloneDeep(
|
||||||
useSyncConfigStore().prefsStorage.simple.muteFilters,
|
useSyncConfigStore().mergedConfig.muteFilters,
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -182,6 +182,7 @@ export const defaultConfigLocal = {
|
||||||
imageCompression: true,
|
imageCompression: true,
|
||||||
useStreamingApi: false,
|
useStreamingApi: false,
|
||||||
}
|
}
|
||||||
|
export const LOCAL_ONLY_KEYS = new Set(Object.keys(defaultConfigLocal))
|
||||||
|
|
||||||
export const makeUndefined = (c) =>
|
export const makeUndefined = (c) =>
|
||||||
Object.fromEntries(Object.keys(c).map((key) => [key, undefined]))
|
Object.fromEntries(Object.keys(c).map((key) => [key, undefined]))
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,6 @@ import { useInstanceStore } from 'src/stores/instance'
|
||||||
|
|
||||||
import { defaultState as configDefaultState } from 'src/modules/default_config_state'
|
import { defaultState as configDefaultState } from 'src/modules/default_config_state'
|
||||||
|
|
||||||
export const LOCAL_ONLY_KEYS = new Set(Object.keys(configDefaultState))
|
|
||||||
|
|
||||||
export const defaultState = {
|
export const defaultState = {
|
||||||
prefsStorage: {
|
prefsStorage: {
|
||||||
...configDefaultState,
|
...configDefaultState,
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
|
import sum from 'hash-sum'
|
||||||
import {
|
import {
|
||||||
merge as _merge,
|
merge as _merge,
|
||||||
clamp,
|
clamp,
|
||||||
cloneDeep,
|
cloneDeep,
|
||||||
|
debounce,
|
||||||
findLastIndex,
|
findLastIndex,
|
||||||
flatten,
|
flatten,
|
||||||
get,
|
get,
|
||||||
|
|
@ -11,25 +13,21 @@ import {
|
||||||
takeRight,
|
takeRight,
|
||||||
uniqWith,
|
uniqWith,
|
||||||
unset,
|
unset,
|
||||||
debounce,
|
|
||||||
} from 'lodash'
|
} from 'lodash'
|
||||||
import { defineStore } from 'pinia'
|
import { defineStore } from 'pinia'
|
||||||
import { toRaw } from 'vue'
|
import { toRaw } from 'vue'
|
||||||
import sum from 'hash-sum'
|
|
||||||
|
|
||||||
import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js'
|
import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js'
|
||||||
|
|
||||||
import { useInstanceStore } from 'src/stores/instance.js'
|
import { useInstanceStore } from 'src/stores/instance.js'
|
||||||
import {
|
import { useLocalConfigStore } from 'src/stores/local_config.js'
|
||||||
LOCAL_ONLY_KEYS,
|
|
||||||
useLocalConfigStore,
|
|
||||||
} from 'src/stores/local_config.js'
|
|
||||||
|
|
||||||
import { storage } from 'src/lib/storage.js'
|
import { storage } from 'src/lib/storage.js'
|
||||||
import {
|
import {
|
||||||
defaultState as configDefaultState,
|
defaultState as configDefaultState,
|
||||||
defaultConfigLocal,
|
defaultConfigLocal,
|
||||||
instanceDefaultConfig,
|
instanceDefaultConfig,
|
||||||
|
LOCAL_ONLY_KEYS,
|
||||||
} from 'src/modules/default_config_state.js'
|
} from 'src/modules/default_config_state.js'
|
||||||
import { defaultConfigSync } from 'src/modules/old_default_config_state.js'
|
import { defaultConfigSync } from 'src/modules/old_default_config_state.js'
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue