kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Final fixes for eslint:recommended

Browse Source
This commit is contained in:
Veeck
2020-04-21 10:37:24 +02:00
committed by rejas
parent d08bd4e866
commit 9ec329b7ae
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/main.js
View File

@@ -344,13 +344,14 @@ var MM = (function() {
* Loads the core config and combines it with de system defaults.
*/
var loadConfig = function() {
let config = window.config;
if (typeof config === "undefined") {
config = defaults;
window.config = defaults;
Log.error("Config file is missing! Please create a config file.");
return;
}
config = Object.assign({}, defaults, config);
window.config = Object.assign({}, defaults, config);
};
/* setSelectionMethodsForModules()