File tree 1 file changed +5
-5
lines changed
1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -40,11 +40,11 @@ export default class ConfigAccumulator {
40
40
usersAppConfig = appConfigFile ;
41
41
}
42
42
// Some settings have their own local storage keys, apply them here
43
- usersAppConfig . layout = appConfigFile . layout
44
- || localStorage [ localStorageKeys . LAYOUT_ORIENTATION ]
43
+ usersAppConfig . layout = localStorage [ localStorageKeys . LAYOUT_ORIENTATION ]
44
+ || appConfigFile . layout
45
45
|| defaultLayout ;
46
- usersAppConfig . iconSize = appConfigFile . iconSize
47
- || localStorage [ localStorageKeys . ICON_SIZE ]
46
+ usersAppConfig . iconSize = localStorage [ localStorageKeys . ICON_SIZE ]
47
+ || appConfigFile . iconSize
48
48
|| defaultIconSize ;
49
49
// Don't let users modify users locally
50
50
if ( appConfigFile . auth ) usersAppConfig . auth = appConfigFile . auth ;
@@ -60,7 +60,7 @@ export default class ConfigAccumulator {
60
60
try { localPageInfo = JSON . parse ( localStorage [ localStorageKeys . PAGE_INFO ] ) ; }
61
61
catch ( e ) { ErrorHandler ( 'Malformed pageInfo data in local storage' ) ; }
62
62
}
63
- const filePageInfo = this . conf ? this . conf . pageInfo || { } : { } ;
63
+ const filePageInfo = this . conf ?. pageInfo || { } ;
64
64
return { ...defaultPageInfo , ...filePageInfo , ...localPageInfo } ;
65
65
}
66
66
You can’t perform that action at this time.
0 commit comments