Merge branch 'develop' into develop

.github/CONTRIBUTING.md

@@ -34,7 +34,7 @@ When submitting a new issue, please supply the following information:
 
 **Node Version**: Make sure it's version 12 or later (recommended is 14).
 
-**MagicMirror Version**: Please let us now which version of MagicMirror you are running. It can be found in the `package.json` file.
+**MagicMirror Version**: Please let us know which version of MagicMirror you are running. It can be found in the `package.json` file.
 
 **Description**: Provide a detailed description about the issue and include specific details to help us understand the problem. Adding screenshots will help describing the problem.
 

.github/ISSUE_TEMPLATE.md

@@ -34,7 +34,7 @@ When submitting a new issue, please supply the following information:
 
 **Node Version**: Make sure it's version 12 or later (recommended is 14).
 
-**MagicMirror Version**: Please let us now which version of MagicMirror you are running. It can be found in the `package.json` file.
+**MagicMirror Version**: Please let us know which version of MagicMirror you are running. It can be found in the `package.json` file.
 
 **Description**: Provide a detailed description about the issue and include specific details to help us understand the problem. Adding screenshots will help describing the problem.
 

CHANGELOG.md

@@ -28,6 +28,7 @@ _This release is scheduled to be released on 2021-10-01._
 
 - Fix undefined error with ignoreToday option in weather module (#2620).
 - Fix time zone correction in calendar module when the date hour is equal to the time zone correction value (#2632).
+- Fix black cursor on startup when using electron.
 
 ## [2.16.0] - 2021-07-01
 

js/electron.js

@@ -72,6 +72,11 @@ function createWindow() {
 		mainWindow.webContents.openDevTools();
 	}
 
+	// simulate mouse move to hide black cursor on start
+	mainWindow.webContents.on("dom-ready", (event) => {
+		mainWindow.webContents.sendInputEvent({ type: "mouseMove", x: 0, y: 0 });
+	});
+
 	// Set responders for window events.
 	mainWindow.on("closed", function () {
 		mainWindow = null;

modules/default/clock/clock.js

@@ -19,7 +19,7 @@ Module.register("clock", {
 		showPeriodUpper: false,
 		clockBold: false,
 		showDate: true,
-		showTime: false,
+		showTime: true,
 		showWeek: false,
 		dateFormat: "dddd, LL",
 
@@ -147,7 +147,7 @@ Module.register("clock", {
 			digitalWrapper.appendChild(dateWrapper);
 		}
 
-		if (this.config.showTime || this.config.displayType !== "analog") {
+		if (this.config.displayType !== "analog" && this.config.showTime) {
 			timeWrapper.innerHTML = timeString;
 			secondsWrapper.innerHTML = now.format("ss");
 			if (this.config.showPeriodUpper) {

package.json

@@ -47,11 +47,11 @@
 	"devDependencies": {
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-jest": "^24.4.0",
-		"eslint-plugin-jsdoc": "^36.0.7",
+		"eslint-plugin-jsdoc": "^36.0.8",
 		"eslint-plugin-prettier": "^3.4.1",
 		"express-basic-auth": "^1.2.0",
-		"husky": "^7.0.1",
-		"jest": "^27.0.6",
+		"husky": "^7.0.2",
+		"jest": "^27.1.0",
 		"jsdom": "^17.0.0",
 		"lodash": "^4.17.21",
 		"nyc": "^15.1.0",
@@ -65,7 +65,7 @@
 		"stylelint-prettier": "^1.2.0"
 	},
 	"optionalDependencies": {
-		"electron": "^13.2.1"
+		"electron": "^13.2.3"
 	},
 	"dependencies": {
 		"colors": "^1.4.0",
@@ -81,7 +81,7 @@
 		"moment": "^2.29.1",
 		"node-fetch": "^2.6.1",
 		"node-ical": "^0.13.0",
-		"simple-git": "^2.44.0",
+		"simple-git": "^2.45.0",
 		"socket.io": "^4.1.3"
 	},
 	"_moduleAliases": {

tests/configs/modules/clock/clock_showTime.js

@@ -0,0 +1,23 @@
+/* Magic Mirror Test config for default clock module
+ *
+ * By Johan Hammar
+ * MIT Licensed.
+ */
+let config = require(process.cwd() + "/tests/configs/default.js").configFactory({
+	timeFormat: 12,
+
+	modules: [
+		{
+			module: "clock",
+			position: "middle_center",
+			config: {
+				showTime: false
+			}
+		}
+	]
+});
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {
+	module.exports = config;
+}

tests/e2e/modules/clock_spec.js

@@ -85,6 +85,19 @@ describe("Clock module", function () {
 		});
 	});
 
+	describe("with showTime config disabled", function () {
+		beforeAll(function () {
+			// Set config sample for use in test
+			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_showTime.js";
+		});
+
+		it("should show not show the time when digital clock is shown", async function () {
+			await app.client.waitUntilWindowLoaded();
+			const time = await app.client.$$(".clock .digital .time");
+			return expect(time.length).toBe(0);
+		});
+	});
+
 	describe("with showWeek config enabled", function () {
 		beforeAll(function () {
 			// Set config sample for use in test