kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into fix_modules_array

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Karsten Hassel 2020-12-29 22:24:19 +01:00
commit e6cefcf948
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -56,6 +56,7 @@ _This release is scheduled to be released on 2021-01-01._
- update Node-ical 0.12.4 , fix invalid RRULE format in cal entries - update Node-ical 0.12.4 , fix invalid RRULE format in cal entries
- fix package.json for optional electron dependency (2378) - fix package.json for optional electron dependency (2378)
- update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379) - update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379)
- Added missing function call in module.show()
- remove undefined objects from modules array (#2382) - remove undefined objects from modules array (#2382)
## [2.13.0] - 2020-10-01 ## [2.13.0] - 2020-10-01

2
js/check_config.js
View File

@ -46,7 +46,7 @@ function checkConfigFile() {
try { try {
fs.accessSync(configFileName, fs.F_OK); fs.accessSync(configFileName, fs.F_OK);
} catch (e) { } catch (e) {
Log.log(Utils.colors.error(e)); Log.error(Utils.colors.error(e));
throw new Error("No permission to access config file!"); throw new Error("No permission to access config file!");
} }

22
js/module.js
View File

@ -228,7 +228,7 @@ var Module = Class.extend({
* Set the module config and combine it with the module defaults. * Set the module config and combine it with the module defaults.
* *
* @param {object} config The combined module config. * @param {object} config The combined module config.
* @param {boolean} config Merge module config in deep. * @param {boolean} deep 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);
@ -434,20 +434,22 @@ var Module = Class.extend({
speed, speed,
function () { function () {
self.resume(); self.resume();
callback; callback();
}, },
options options
); );
} }
}); });
/** Merging MagicMirror (or other) default/config script /**
* merge 2 objects or/with array * Merging MagicMirror (or other) default/config script by @bugsounet
* using: * Merge 2 objects or/with array
*
* Usage:
* ------- * -------
* this.config = configMerge({}, this.defaults, this.config) * this.config = configMerge({}, this.defaults, this.config)
* ------- * -------
* arg1: initial objet * arg1: initial object
* arg2: config model * arg2: config model
* arg3: config to merge * arg3: config to merge
* ------- * -------
@ -456,10 +458,12 @@ var Module = Class.extend({
* it don't merge all thing in deep * it don't merge all thing in deep
* -> object in object and array is not merging * -> object in object and array is not merging
* ------- * -------
* @bugsounet *
* @Todo: idea of Mich determinate what do you want to merge or not * Todo: idea of Mich determinate what do you want to merge or not
*
* @param {object} result the initial object
* @returns {object} the merged config
*/ */
function configMerge(result) { function configMerge(result) {
var stack = Array.prototype.slice.call(arguments, 1); var stack = Array.prototype.slice.call(arguments, 1);
var item; var item;

2
js/server.js
View File

@ -37,7 +37,7 @@ var Server = function (config, callback) {
server.listen(port, config.address ? config.address : "localhost"); server.listen(port, config.address ? config.address : "localhost");
if (config.ipWhitelist instanceof Array && config.ipWhitelist.length === 0) { if (config.ipWhitelist instanceof Array && config.ipWhitelist.length === 0) {
Log.info(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs")); Log.warn(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs"));
} }
app.use(function (req, res, next) { app.use(function (req, res, next) {