tyler.durden
/
dashy
mirror of https://github.com/Lissy93/dashy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🐛 Fixes item size/ layout buttons (#629)

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;
}
// Some settings have their own local storage keys, apply them here
usersAppConfig.layout = appConfigFile.layout
|| localStorage[localStorageKeys.LAYOUT_ORIENTATION]
usersAppConfig.layout = localStorage[localStorageKeys.LAYOUT_ORIENTATION]
|| appConfigFile.layout
|| defaultLayout;
usersAppConfig.iconSize = appConfigFile.iconSize
|| localStorage[localStorageKeys.ICON_SIZE]
usersAppConfig.iconSize = localStorage[localStorageKeys.ICON_SIZE]
|| appConfigFile.iconSize
|| defaultIconSize;
// Don't let users modify users locally
if (appConfigFile.auth) usersAppConfig.auth = appConfigFile.auth;
@ -60,7 +60,7 @@ export default class ConfigAccumulator {
try { localPageInfo = JSON.parse(localStorage[localStorageKeys.PAGE_INFO]); }
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 };
}