mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-08-21 12:55:22 +00:00
Checking formatting...
All matched files use Prettier code style!
This commit is contained in:
@@ -221,7 +221,7 @@ var Module = Class.extend({
|
|||||||
this.identifier = data.identifier;
|
this.identifier = data.identifier;
|
||||||
this.hidden = false;
|
this.hidden = false;
|
||||||
|
|
||||||
this.setConfig(data.config,data.configDeepMerge);
|
this.setConfig(data.config, data.configDeepMerge);
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -231,7 +231,7 @@ var Module = Class.extend({
|
|||||||
* @param {boolean} config Merge module config in deep.
|
* @param {boolean} config Merge module config in deep.
|
||||||
*/
|
*/
|
||||||
setConfig: function (config, deep) {
|
setConfig: function (config, deep) {
|
||||||
this.config= deep ? configMerge({}, this.defaults, config) : Object.assign({}, this.defaults, config);
|
this.config = deep ? configMerge({}, this.defaults, config) : Object.assign({}, this.defaults, config);
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -481,7 +481,7 @@ function configMerge(result) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
};
|
}
|
||||||
|
|
||||||
Module.definitions = {};
|
Module.definitions = {};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user