fix loading settings from fresh install

This commit is contained in:
joshuaboud 2022-05-17 12:56:14 -03:00
parent e54b028e34
commit 11182d0cf2
No known key found for this signature in database
GPG Key ID: 17EFB59E2A8BF50E

View File

@ -11,13 +11,14 @@
@apply="showMenu = false" @apply="showMenu = false"
> >
<div class="flex flex-col gap-content items-start"> <div class="flex flex-col gap-content items-start">
<template v-if="settings.directoryView">
<div class="inline-flex flex-col gap-content"> <div class="inline-flex flex-col gap-content">
<LabelledSwitch v-model="darkMode">Dark mode</LabelledSwitch> <LabelledSwitch v-model="darkMode">Dark mode</LabelledSwitch>
<LabelledSwitch v-model="settings.directoryView.showHidden">Show hidden files</LabelledSwitch> <LabelledSwitch v-model="settings.directoryView.showHidden">Show hidden files</LabelledSwitch>
<LabelledSwitch v-model="booleanAnalogs.directoryView.view.bool">List view</LabelledSwitch>
<LabelledSwitch <LabelledSwitch
v-model="booleanAnalogs.directoryView.view.bool" v-model="settings.directoryView.separateDirs"
>List view</LabelledSwitch> >Separate directories while sorting</LabelledSwitch>
<LabelledSwitch v-model="settings.directoryView.separateDirs">Separate directories while sorting</LabelledSwitch>
</div> </div>
<div v-if="booleanAnalogs.directoryView.view.bool" class="self-stretch"> <div v-if="booleanAnalogs.directoryView.view.bool" class="self-stretch">
<div>List view columns</div> <div>List view columns</div>
@ -137,6 +138,7 @@
</div> </div>
</div> </div>
</div> </div>
</template>
</div> </div>
</ModalPopup> </ModalPopup>
</template> </template>
@ -191,17 +193,17 @@ export default {
...storedSettings, ...storedSettings,
directoryView: { directoryView: {
...defaultSettings.directoryView, ...defaultSettings.directoryView,
...storedSettings.directoryView, ...(storedSettings.directoryView ?? {}),
cols: { cols: {
...defaultSettings.directoryView.cols, ...defaultSettings.directoryView.cols,
...storedSettings.directoryView.cols, ...(storedSettings.directoryView?.cols ?? {}),
} }
}, },
}); });
watch(settings, () => { watch(settings, () => {
localStorage.setItem(settingsStorageKey, JSON.stringify(settings)); localStorage.setItem(settingsStorageKey, JSON.stringify(settings));
booleanAnalogs.directoryView.view.bool = settings.directoryView.view === booleanAnalogs.directoryView.view.trueValue; booleanAnalogs.directoryView.view.bool = settings.directoryView?.view === booleanAnalogs.directoryView.view.trueValue;
}, { immediate: true }); }, { immediate: true });
watch(booleanAnalogs, () => { watch(booleanAnalogs, () => {