unrelated change
This commit is contained in:
parent
2881b31ff2
commit
cd66dabf94
3 changed files with 6 additions and 6 deletions
|
|
@ -17,7 +17,7 @@ config.autoAddCss = false
|
||||||
import App from '../App.vue'
|
import App from '../App.vue'
|
||||||
import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
|
import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
|
||||||
import FaviconService from '../services/favicon_service/favicon_service.js'
|
import FaviconService from '../services/favicon_service/favicon_service.js'
|
||||||
import { applyConfig } from '../services/style_setter/style_setter.js'
|
import { applyStyleConfig } from '../services/style_setter/style_setter.js'
|
||||||
import { initServiceWorker, updateFocus } from '../services/sw/sw.js'
|
import { initServiceWorker, updateFocus } from '../services/sw/sw.js'
|
||||||
import {
|
import {
|
||||||
windowHeight,
|
windowHeight,
|
||||||
|
|
@ -547,7 +547,7 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
|
||||||
return Promise.reject(e)
|
return Promise.reject(e)
|
||||||
}
|
}
|
||||||
|
|
||||||
applyConfig(store.state.config, i18n.global)
|
applyStyleConfig(store.state.config, i18n.global)
|
||||||
|
|
||||||
// Now we can try getting the server settings and logging in
|
// Now we can try getting the server settings and logging in
|
||||||
// Most of these are preloaded into the index.html so blocking is minimized
|
// Most of these are preloaded into the index.html so blocking is minimized
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ import { set } from 'lodash'
|
||||||
|
|
||||||
import messages from '../i18n/messages'
|
import messages from '../i18n/messages'
|
||||||
import localeService from '../services/locale/locale.service.js'
|
import localeService from '../services/locale/locale.service.js'
|
||||||
import { applyConfig } from '../services/style_setter/style_setter.js'
|
import { applyStyleConfig } from '../services/style_setter/style_setter.js'
|
||||||
import { defaultState, instanceDefaultConfig } from './default_config_state.js'
|
import { defaultState, instanceDefaultConfig } from './default_config_state.js'
|
||||||
|
|
||||||
import { useEmojiStore } from 'src/stores/emoji.js'
|
import { useEmojiStore } from 'src/stores/emoji.js'
|
||||||
|
|
@ -71,7 +71,7 @@ const config = {
|
||||||
mutations: {
|
mutations: {
|
||||||
setOptionTemporarily(state, { name, value }) {
|
setOptionTemporarily(state, { name, value }) {
|
||||||
set(state, name, value)
|
set(state, name, value)
|
||||||
applyConfig(state)
|
applyStyleConfig(state)
|
||||||
},
|
},
|
||||||
setOption(state, { name, value }) {
|
setOption(state, { name, value }) {
|
||||||
set(state, name, value)
|
set(state, name, value)
|
||||||
|
|
@ -162,7 +162,7 @@ const config = {
|
||||||
} else {
|
} else {
|
||||||
commit('setOption', { name, value })
|
commit('setOption', { name, value })
|
||||||
if (APPEARANCE_SETTINGS_KEYS.has(name)) {
|
if (APPEARANCE_SETTINGS_KEYS.has(name)) {
|
||||||
applyConfig(state)
|
applyStyleConfig(state)
|
||||||
}
|
}
|
||||||
if (name.startsWith('theme3hacks')) {
|
if (name.startsWith('theme3hacks')) {
|
||||||
dispatch('applyTheme', { recompile: true })
|
dispatch('applyTheme', { recompile: true })
|
||||||
|
|
|
||||||
|
|
@ -255,7 +255,7 @@ const extractStyleConfig = ({
|
||||||
|
|
||||||
const defaultStyleConfig = extractStyleConfig(defaultState)
|
const defaultStyleConfig = extractStyleConfig(defaultState)
|
||||||
|
|
||||||
export const applyConfig = (input) => {
|
export const applyStyleConfig = (input) => {
|
||||||
const config = extractStyleConfig(input)
|
const config = extractStyleConfig(input)
|
||||||
|
|
||||||
if (config === defaultStyleConfig) {
|
if (config === defaultStyleConfig) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue