From 67bedf864808958d92cb0f0dc702c0418126caa2 Mon Sep 17 00:00:00 2001
From: rejas <github@veeck.de>
Date: Thu, 23 Apr 2020 07:24:20 +0200
Subject: [PATCH 1/4] Add missing function ()

---
 js/module.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/js/module.js b/js/module.js
index 40f9b311..28291a84 100644
--- a/js/module.js
+++ b/js/module.js
@@ -429,15 +429,10 @@ var Module = Class.extend({
 		options = options || {};
 
 		var self = this;
-		MM.showModule(
-			this,
-			speed,
-			function () {
-				self.resume();
-				callback;
-			},
-			options
-		);
+		MM.showModule(this, speed, function () {
+			self.resume();
+			callback();
+		}, options);
 	}
 });
 

From efafb1c28a8cebe4fc480a429f051c83f8f68882 Mon Sep 17 00:00:00 2001
From: rejas <github@veeck.de>
Date: Tue, 29 Dec 2020 18:48:45 +0100
Subject: [PATCH 2/4] Cleanup jsdoc

---
 js/module.js | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/js/module.js b/js/module.js
index 28291a84..d52eb02b 100644
--- a/js/module.js
+++ b/js/module.js
@@ -228,7 +228,7 @@ var Module = Class.extend({
 	 * Set the module config and combine it with the module defaults.
 	 *
 	 * @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) {
 		this.config = deep ? configMerge({}, this.defaults, config) : Object.assign({}, this.defaults, config);
@@ -429,20 +429,27 @@ var Module = Class.extend({
 		options = options || {};
 
 		var self = this;
-		MM.showModule(this, speed, function () {
-			self.resume();
-			callback();
-		}, options);
+		MM.showModule(
+			this,
+			speed,
+			function () {
+				self.resume();
+				callback();
+			},
+			options
+		);
 	}
 });
 
-/** Merging MagicMirror (or other) default/config script
- * merge 2 objects or/with array
- * using:
+/**
+ * Merging MagicMirror (or other) default/config script by @bugsounet
+ * Merge 2 objects or/with array
+ *
+ * Usage:
  * -------
  * this.config = configMerge({}, this.defaults, this.config)
  * -------
- * arg1: initial objet
+ * arg1: initial object
  * arg2: config model
  * arg3: config to merge
  * -------
@@ -451,10 +458,12 @@ var Module = Class.extend({
  * it don't merge all thing in deep
  * -> 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) {
 	var stack = Array.prototype.slice.call(arguments, 1);
 	var item;

From 3fcbf159155c233450e11c7bbea2ffb8a9fa915f Mon Sep 17 00:00:00 2001
From: rejas <github@veeck.de>
Date: Tue, 29 Dec 2020 18:50:10 +0100
Subject: [PATCH 3/4] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09d887bb..d950b549 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
 - fix package.json for optional electron dependency (2378)
 - update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379)
+- Added missing function call in module.show()
 
 ## [2.13.0] - 2020-10-01
 

From 7a4eddc592615361768b1d6e3ab8884502640ecf Mon Sep 17 00:00:00 2001
From: rejas <github@veeck.de>
Date: Sat, 20 Jun 2020 12:07:04 +0200
Subject: [PATCH 4/4] Adjust some log levels

---
 js/check_config.js | 2 +-
 js/server.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/check_config.js b/js/check_config.js
index 2bab5220..c9bfe442 100644
--- a/js/check_config.js
+++ b/js/check_config.js
@@ -46,7 +46,7 @@ function checkConfigFile() {
 	try {
 		fs.accessSync(configFileName, fs.F_OK);
 	} catch (e) {
-		Log.log(Utils.colors.error(e));
+		Log.error(Utils.colors.error(e));
 		throw new Error("No permission to access config file!");
 	}
 
diff --git a/js/server.js b/js/server.js
index b0ae9528..cd26190b 100644
--- a/js/server.js
+++ b/js/server.js
@@ -37,7 +37,7 @@ var Server = function (config, callback) {
 	server.listen(port, config.address ? config.address : "localhost");
 
 	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) {