kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-30 13:09:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into helmet

Browse Source
This commit is contained in:
Karsten Hassel 2022-01-12 20:07:20 +01:00
commit 14a22efae1
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ _This release is scheduled to be released on 2022-04-01._
- Added a config option under the weather module, absoluteDates, providing an option to format weather forecast date output with either absolute or relative dates. - Added a config option under the weather module, absoluteDates, providing an option to format weather forecast date output with either absolute or relative dates.
- Added test for new weather forecast absoluteDates porperty. - Added test for new weather forecast absoluteDates porperty.
- The modules get a class hidden added/removed if they get hidden/shown
### Updated ### Updated

2
README.md
View File

@ -40,7 +40,7 @@ Contributions of all kinds are welcome, not only in the form of code but also wi
- documentation - documentation
- translations - translations
For the full contribution guidelines, check out: [https://docs.magicmirror.builders/getting-started/contributing.html](https://docs.magicmirror.builders/getting-started/contributing.html) For the full contribution guidelines, check out: [https://docs.magicmirror.builders/about/contributing.html](https://docs.magicmirror.builders/about/contributing.html)
## Enjoying MagicMirror? Consider a donation! ## Enjoying MagicMirror? Consider a donation!

2
js/main.js
View File

@ -245,6 +245,7 @@ const MM = (function () {
if (moduleWrapper !== null) { if (moduleWrapper !== null) {
moduleWrapper.style.transition = "opacity " + speed / 1000 + "s"; moduleWrapper.style.transition = "opacity " + speed / 1000 + "s";
moduleWrapper.style.opacity = 0; moduleWrapper.style.opacity = 0;
moduleWrapper.classList.add("hidden");
clearTimeout(module.showHideTimer); clearTimeout(module.showHideTimer);
module.showHideTimer = setTimeout(function () { module.showHideTimer = setTimeout(function () {
@ -310,6 +311,7 @@ const MM = (function () {
moduleWrapper.style.transition = "opacity " + speed / 1000 + "s"; moduleWrapper.style.transition = "opacity " + speed / 1000 + "s";
// Restore the position. See hideModule() for more info. // Restore the position. See hideModule() for more info.
moduleWrapper.style.position = "static"; moduleWrapper.style.position = "static";
moduleWrapper.classList.remove("hidden");
updateWrapperStates(); updateWrapperStates();