tyler.durden/cockpit-navigator
1
0
Fork 0
mirror of https://github.com/45Drives/cockpit-navigator.git synced 2025-09-26 03:08:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

use assignObjectRecursive

Browse Source
This commit is contained in:
joshuaboud 2022-05-26 17:07:22 -03:00
parent f8c4806aa5
commit 973ac41c9c
No known key found for this signature in database
GPG Key ID: 17EFB59E2A8BF50E
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
navigator/src/components/SettingsMenu.vue
View File

@ -149,6 +149,7 @@ import LabelledSwitch from './LabelledSwitch.vue';
import ModalPopup from './ModalPopup.vue'; import ModalPopup from './ModalPopup.vue';
import { AdjustmentsIcon, ChevronRightIcon, ChevronLeftIcon } from '@heroicons/vue/solid'; import { AdjustmentsIcon, ChevronRightIcon, ChevronLeftIcon } from '@heroicons/vue/solid';
import { settingsInjectionKey } from '../keys'; import { settingsInjectionKey } from '../keys';
import assignObjectRecursive from '../functions/assignObjectRecursive';
/** /**
* @type {NavigatorSettings} * @type {NavigatorSettings}
@ -196,19 +197,7 @@ export default {
}, },
}) })
const storedSettings = JSON.parse(localStorage.getItem(settingsStorageKey)) ?? {}; assignObjectRecursive(settings, JSON.parse(localStorage.getItem(settingsStorageKey)) ?? {}, defaultSettings);
Object.assign(settings, {
...defaultSettings,
...storedSettings,
directoryView: {
...defaultSettings.directoryView,
...(storedSettings.directoryView ?? {}),
cols: {
...defaultSettings.directoryView.cols,
...(storedSettings.directoryView?.cols ?? {}),
}
},
});
watch(settings, () => { watch(settings, () => {
localStorage.setItem(settingsStorageKey, JSON.stringify(settings)); localStorage.setItem(settingsStorageKey, JSON.stringify(settings));