fixes for clean state
This commit is contained in:
parent
a7e1ce20bf
commit
89b916da28
|
@ -123,6 +123,8 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
copyInstanceOption('theme')
|
copyInstanceOption('theme')
|
||||||
|
copyInstanceOption('style')
|
||||||
|
copyInstanceOption('palette')
|
||||||
copyInstanceOption('nsfwCensorImage')
|
copyInstanceOption('nsfwCensorImage')
|
||||||
copyInstanceOption('background')
|
copyInstanceOption('background')
|
||||||
copyInstanceOption('hidePostStats')
|
copyInstanceOption('hidePostStats')
|
||||||
|
|
|
@ -99,6 +99,8 @@ const defaultState = {
|
||||||
sidebarRight: false,
|
sidebarRight: false,
|
||||||
subjectLineBehavior: 'email',
|
subjectLineBehavior: 'email',
|
||||||
theme: 'pleroma-dark',
|
theme: 'pleroma-dark',
|
||||||
|
palette: null,
|
||||||
|
style: null,
|
||||||
emojiReactionsScale: 0.5,
|
emojiReactionsScale: 0.5,
|
||||||
textSize: '14px',
|
textSize: '14px',
|
||||||
emojiSize: '2.2rem',
|
emojiSize: '2.2rem',
|
||||||
|
|
|
@ -331,7 +331,7 @@ const interfaceMod = {
|
||||||
} else {
|
} else {
|
||||||
result.nameUsed = name
|
result.nameUsed = name
|
||||||
|
|
||||||
if (result.nameUsed === 'stock') {
|
if (result.nameUsed == null) {
|
||||||
result.dataUsed = null
|
result.dataUsed = null
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
@ -448,8 +448,10 @@ const interfaceMod = {
|
||||||
)
|
)
|
||||||
state.paletteNameUsed = palette.nameUsed
|
state.paletteNameUsed = palette.nameUsed
|
||||||
state.paletteDataUsed = palette.dataUsed
|
state.paletteDataUsed = palette.dataUsed
|
||||||
state.paletteDataUsed.link = state.paletteDataUsed.link || state.paletteDataUsed.accent
|
if (state.paletteDataUsed) {
|
||||||
state.paletteDataUsed.accent = state.paletteDataUsed.accent || state.paletteDataUsed.link
|
state.paletteDataUsed.link = state.paletteDataUsed.link || state.paletteDataUsed.accent
|
||||||
|
state.paletteDataUsed.accent = state.paletteDataUsed.accent || state.paletteDataUsed.link
|
||||||
|
}
|
||||||
if (Array.isArray(state.paletteDataUsed)) {
|
if (Array.isArray(state.paletteDataUsed)) {
|
||||||
const [
|
const [
|
||||||
name,
|
name,
|
||||||
|
|
Loading…
Reference in a new issue