tyler.durden/dashy
1
0
Fork 0
mirror of https://github.com/Lissy93/dashy.git synced 2025-07-29 00:25:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fixes item size/ layout buttons (#629)

Browse Source
This commit is contained in:
Alicia Sykes 2022-05-14 13:12:29 +01:00
parent 064c64465e
commit 24e487cde5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/ConfigAccumalator.js
View File

@ -40,11 +40,11 @@ export default class ConfigAccumulator {
usersAppConfig = appConfigFile; usersAppConfig = appConfigFile;
} }
// Some settings have their own local storage keys, apply them here // Some settings have their own local storage keys, apply them here
usersAppConfig.layout = appConfigFile.layout usersAppConfig.layout = localStorage[localStorageKeys.LAYOUT_ORIENTATION]
|| localStorage[localStorageKeys.LAYOUT_ORIENTATION] || appConfigFile.layout
|| defaultLayout; || defaultLayout;
usersAppConfig.iconSize = appConfigFile.iconSize usersAppConfig.iconSize = localStorage[localStorageKeys.ICON_SIZE]
|| localStorage[localStorageKeys.ICON_SIZE] || appConfigFile.iconSize
|| defaultIconSize; || defaultIconSize;
// Don't let users modify users locally // Don't let users modify users locally
if (appConfigFile.auth) usersAppConfig.auth = appConfigFile.auth; if (appConfigFile.auth) usersAppConfig.auth = appConfigFile.auth;
@ -60,7 +60,7 @@ export default class ConfigAccumulator {
try { localPageInfo = JSON.parse(localStorage[localStorageKeys.PAGE_INFO]); } try { localPageInfo = JSON.parse(localStorage[localStorageKeys.PAGE_INFO]); }
catch (e) { ErrorHandler('Malformed pageInfo data in local storage'); } catch (e) { ErrorHandler('Malformed pageInfo data in local storage'); }
} }
const filePageInfo = this.conf ? this.conf.pageInfo || {} : {}; const filePageInfo = this.conf?.pageInfo || {};
return { ...defaultPageInfo, ...filePageInfo, ...localPageInfo }; return { ...defaultPageInfo, ...filePageInfo, ...localPageInfo };
} }