fixed up temporary changes
This commit is contained in:
parent
80e09efd71
commit
1b310d7174
7 changed files with 13 additions and 9 deletions
|
|
@ -154,7 +154,7 @@ export default {
|
||||||
newPostButtonShown() {
|
newPostButtonShown() {
|
||||||
if (this.isChats) return false
|
if (this.isChats) return false
|
||||||
if (this.isListEdit) return false
|
if (this.isListEdit) return false
|
||||||
return (this.alwaysShowNewPostButton || this.layoutType === 'mobile')
|
return this.alwaysShowNewPostButton || this.layoutType === 'mobile'
|
||||||
},
|
},
|
||||||
reverseLayout() {
|
reverseLayout() {
|
||||||
const { thirdColumnMode, sidebarRight: reverseSetting } =
|
const { thirdColumnMode, sidebarRight: reverseSetting } =
|
||||||
|
|
@ -172,8 +172,10 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
...mapState(useSyncConfigStore, {
|
...mapState(useSyncConfigStore, {
|
||||||
shoutboxPosition: (store) => store.mergedConfig.alwaysShowSubjectInput || false,
|
shoutboxPosition: (store) =>
|
||||||
alwaysShowSubjectInput: (store) => store.mergedConfig.alwaysShowSubjectInput,
|
store.mergedConfig.alwaysShowSubjectInput || false,
|
||||||
|
alwaysShowSubjectInput: (store) =>
|
||||||
|
store.mergedConfig.alwaysShowSubjectInput,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
...mapState(useInterfaceStore, ['layoutType']),
|
...mapState(useInterfaceStore, ['layoutType']),
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import { cloneDeep, get, isEqual, set } from 'lodash'
|
import { cloneDeep, get, isEqual, set } from 'lodash'
|
||||||
|
|
||||||
import { useInstanceStore } from 'src/stores/instance'
|
import { useInstanceStore } from 'src/stores/instance.js'
|
||||||
|
import { useInterfaceStore } from 'src/stores/interface.js'
|
||||||
import { useSyncConfigStore } from 'src/stores/sync_config.js'
|
import { useSyncConfigStore } from 'src/stores/sync_config.js'
|
||||||
import DraftButtons from './draft_buttons.vue'
|
import DraftButtons from './draft_buttons.vue'
|
||||||
import ModifiedIndicator from './modified_indicator.vue'
|
import ModifiedIndicator from './modified_indicator.vue'
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import { mapState } from 'pinia'
|
import { mapState } from 'pinia'
|
||||||
|
|
||||||
import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
|
import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
|
||||||
import { useInstanceStore } from 'src/stores/instance.js'
|
import { useInstanceStore } from 'src/stores/instance.js'
|
||||||
import BooleanSetting from '../helpers/boolean_setting.vue'
|
import BooleanSetting from '../helpers/boolean_setting.vue'
|
||||||
|
|
@ -20,7 +21,7 @@ const VersionTab = {
|
||||||
'backendVersion',
|
'backendVersion',
|
||||||
'backendRepository',
|
'backendRepository',
|
||||||
'frontendVersion',
|
'frontendVersion',
|
||||||
])
|
]),
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
clearAssetCache() {
|
clearAssetCache() {
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ const GeneralTab = {
|
||||||
updateFont(key, value) {
|
updateFont(key, value) {
|
||||||
useSyncConfigStore().setPreference({
|
useSyncConfigStore().setPreference({
|
||||||
path: `simple.theme3hacks.fonts.${key}`,
|
path: `simple.theme3hacks.fonts.${key}`,
|
||||||
value
|
value,
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,10 @@ import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_ti
|
||||||
import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
|
import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
|
||||||
import localeService from 'src/services/locale/locale.service.js'
|
import localeService from 'src/services/locale/locale.service.js'
|
||||||
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
|
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
|
||||||
|
import { useEmojiStore } from 'src/stores/emoji.js'
|
||||||
import { useInstanceStore } from 'src/stores/instance.js'
|
import { useInstanceStore } from 'src/stores/instance.js'
|
||||||
import { usePostStatusStore } from 'src/stores/post_status'
|
import { usePostStatusStore } from 'src/stores/post_status'
|
||||||
import { useSyncConfigStore } from 'src/stores/sync_config.js'
|
import { useSyncConfigStore } from 'src/stores/sync_config.js'
|
||||||
import { useEmojiStore } from 'src/stores/emoji.js'
|
|
||||||
import { useInterfaceStore } from '../../stores/interface'
|
import { useInterfaceStore } from '../../stores/interface'
|
||||||
import { useMediaViewerStore } from '../../stores/media_viewer'
|
import { useMediaViewerStore } from '../../stores/media_viewer'
|
||||||
import AccountActions from '../account_actions/account_actions.vue'
|
import AccountActions from '../account_actions/account_actions.vue'
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
export const piniaLanguagePlugin = ({ store, options }) => {
|
export const piniaLanguagePlugin = ({ store, options }) => {
|
||||||
if (store.$id === 'serverSideStorage') {
|
if (store.$id === 'syncConfig') {
|
||||||
store.$onAction(({ store }) => {
|
store.$onAction(({ store }) => {
|
||||||
console.log(store)
|
console.log(store)
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ export const useInterfaceStore = defineStore('interface', {
|
||||||
this.temporaryChangesConfirm = confirm
|
this.temporaryChangesConfirm = confirm
|
||||||
this.temporaryChangesRevert = revert
|
this.temporaryChangesRevert = revert
|
||||||
const countdownFunc = () => {
|
const countdownFunc = () => {
|
||||||
if (this.temporaryChangesCountdown === 1) {
|
if (this.temporaryChangesCountdown <= 1) {
|
||||||
this.temporaryChangesRevert()
|
this.temporaryChangesRevert()
|
||||||
this.clearTemporaryChanges()
|
this.clearTemporaryChanges()
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue