Merge branch 'develop' into compliments

CHANGELOG.md

@@ -40,6 +40,7 @@ Special thanks to: @rejas, @sdetweil, @MagMar94
   - Refactor conversion functions into utils class (#2958)
 - The `cors`-method in `server.js` now supports sending and receiving HTTP headers.
 - Cleanup compliments module
+- Updated dependencies: electron to v22 (#2903), fix playwright to v1.27.1 (#2969)
 
 ### Fixed
 
@@ -49,6 +50,7 @@ Special thanks to: @rejas, @sdetweil, @MagMar94
 - Possibility to change FontAwesome class in calendar, so icons like `fab fa-facebook-square` works.
 - Fix cors problems with newsfeed articles (as far as possible), allow disabling cors per feed with option `useCorsProxy: false` (#2840)
 - Tests not waiting for the application to start and stop before starting the next test
+- Fixed gap in clock module when displayed on the left side with displayType=digital
 
 ## [2.21.0] - 2022-10-01
 

modules/default/clock/clock.js

@@ -303,24 +303,24 @@ Module.register("clock", {
 		}
 
 		/*******************************************
-		 * Update placement, respect old analogShowDate even if its not needed anymore
+		 * Update placement, respect old analogShowDate even if it's not needed anymore
 		 */
 		if (this.config.displayType === "analog") {
 			// Display only an analog clock
 			if (this.config.analogShowDate === "top") {
 				wrapper.classList.add("clockGrid--bottom");
 			} else if (this.config.analogShowDate === "bottom") {
 				wrapper.classList.add("clockGrid--top");
-			} else {
-				//analogWrapper.style.gridArea = "center";
 			}
+			wrapper.appendChild(analogWrapper);
+		} else if (this.config.displayType === "digital") {
+			wrapper.appendChild(digitalWrapper);
 		} else if (this.config.displayType === "both") {
 			wrapper.classList.add("clockGrid--" + this.config.analogPlacement);
+			wrapper.appendChild(analogWrapper);
+			wrapper.appendChild(digitalWrapper);
 		}
 
-		wrapper.appendChild(analogWrapper);
-		wrapper.appendChild(digitalWrapper);
-
 		// Return the wrapper to the dom.
 		return wrapper;
 	}