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

Only add clock type wrappers to DOM when they are used (#2971)

Browse Source 
Fixes a layout gap when digital clock is displayd on the left

Reported via discord:
https://discord.com/channels/545884423703494657/545884914982322177/1044376412997562418

Co-authored-by: veeck <michael@veeck.de>
This commit is contained in:
Veeck 2022-12-10 21:17:29 +01:00 committed by GitHub
parent abbae90a8f
commit eee289aee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -49,6 +49,7 @@ Special thanks to: @rejas, @sdetweil, @MagMar94
- Possibility to change FontAwesome class in calendar, so icons like `fab fa-facebook-square` works. - 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) - 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 - 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 ## [2.21.0] - 2022-10-01

12
modules/default/clock/clock.js
View File

@ -303,7 +303,7 @@ 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") { if (this.config.displayType === "analog") {
// Display only an analog clock // Display only an analog clock
@ -311,16 +311,16 @@ Module.register("clock", {
wrapper.classList.add("clockGrid--bottom"); wrapper.classList.add("clockGrid--bottom");
} else if (this.config.analogShowDate === "bottom") { } else if (this.config.analogShowDate === "bottom") {
wrapper.classList.add("clockGrid--top"); 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") { } else if (this.config.displayType === "both") {
wrapper.classList.add("clockGrid--" + this.config.analogPlacement); 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 the wrapper to the dom.
return wrapper; return wrapper;
} }