kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-03 22:36:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2161 from Snille/develop

Browse Source 
Fixes the un-hide problem with currentwether and weatherforcast modules.
This commit is contained in:
Michael Teeuw 2020-10-13 09:13:05 +02:00 committed by GitHub
commit 0c61ba8f2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ _This release is scheduled to be released on 2021-01-01._
### Fixed ### Fixed
- Fixed the "un-hide on update" problem with "currentwather" and "watherforcast" modules.
- JSON Parse translation files with comments crashing UI. (#2149) - JSON Parse translation files with comments crashing UI. (#2149)
- Calendar parsing where RRULE bug returns wrong date, add Windows timezone name support. (#2145, #2151) - Calendar parsing where RRULE bug returns wrong date, add Windows timezone name support. (#2145, #2151)
- Wrong node-ical version installed (package.json) requested version. (#2153) - Wrong node-ical version installed (package.json) requested version. (#2153)

11
modules/default/currentweather/currentweather.js
View File

@ -495,11 +495,12 @@ Module.register("currentweather", {
this.sunriseSunsetTime = timeString; this.sunriseSunsetTime = timeString;
this.sunriseSunsetIcon = sunrise < now && sunset > now ? "wi-sunset" : "wi-sunrise"; this.sunriseSunsetIcon = sunrise < now && sunset > now ? "wi-sunset" : "wi-sunrise";
if (!this.hidden) {
this.show(this.config.animationSpeed, { lockString: this.identifier }); this.show(this.config.animationSpeed, { lockString: this.identifier });
this.loaded = true; this.loaded = true;
this.updateDom(this.config.animationSpeed); this.updateDom(this.config.animationSpeed);
this.sendNotification("CURRENTWEATHER_DATA", { data: data }); this.sendNotification("CURRENTWEATHER_DATA", { data: data });
}
}, },
/* scheduleUpdate() /* scheduleUpdate()

8
modules/default/weatherforecast/weatherforecast.js
View File

@ -408,9 +408,11 @@ Module.register("weatherforecast", {
} }
//Log.log(this.forecast); //Log.log(this.forecast);
this.show(this.config.animationSpeed, { lockString: this.identifier }); if (!this.hidden) {
this.loaded = true; this.show(this.config.animationSpeed, { lockString: this.identifier });
this.updateDom(this.config.animationSpeed); this.loaded = true;
this.updateDom(this.config.animationSpeed);
}
}, },
/* scheduleUpdate() /* scheduleUpdate()