kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-03 22:36:09 +00:00
Code Issues Projects Releases Wiki Activity

apply ConfigMerge() if configDeepMerge: true

Browse Source
This commit is contained in:
Cédric 2020-09-21 23:21:43 +02:00 committed by GitHub
parent 1f473228ce
commit 97c2bab58a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/module.js
View File

@ -230,8 +230,8 @@ var Module = Class.extend({
* @param {object} config The combined module config. * @param {object} config The combined module config.
* @param {boolean} config Merge module config in deep. * @param {boolean} config Merge module config in deep.
*/ */
setConfig: function (config) { setConfig: function (config, deep) {
this.config = Object.assign({}, this.defaults, config); this.config= deep ? configMerge({}, this.defaults, config) : Object.assign({}, this.defaults, config);
}, },
/** /**