Skip to content

Fixes the un-hide problem with currentwether and weatherforcast modules. #2161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichMich merged 3 commits into from
Oct 13, 2020
Merged

Fixes the un-hide problem with currentwether and weatherforcast modules. #2161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7462d61
Makes the module stay hidden without a lock.
Snille Oct 11, 2020
ecd9828
Makes the module stay hidden without a lock.
Snille Oct 11, 2020
644aa26
Update CHANGELOG.md
Snille Oct 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ _This release is scheduled to be released on 2021-01-01._

### Fixed

- Fixed the "un-hide on update" problem with "currentwather" and "watherforcast" modules.
- JSON Parse translation files with comments crashing UI. (#2149)
- 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)
Expand Down
11 changes: 6 additions & 5 deletions modules/default/currentweather/currentweather.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,11 +495,12 @@ Module.register("currentweather", {

this.sunriseSunsetTime = timeString;
this.sunriseSunsetIcon = sunrise < now && sunset > now ? "wi-sunset" : "wi-sunrise";

this.show(this.config.animationSpeed, { lockString: this.identifier });
this.loaded = true;
this.updateDom(this.config.animationSpeed);
this.sendNotification("CURRENTWEATHER_DATA", { data: data });
if (!this.hidden) {
this.show(this.config.animationSpeed, { lockString: this.identifier });
this.loaded = true;
this.updateDom(this.config.animationSpeed);
this.sendNotification("CURRENTWEATHER_DATA", { data: data });
}
},

/* scheduleUpdate()
Expand Down
8 changes: 5 additions & 3 deletions modules/default/weatherforecast/weatherforecast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,9 +408,11 @@ Module.register("weatherforecast", {
}

//Log.log(this.forecast);
this.show(this.config.animationSpeed, { lockString: this.identifier });
this.loaded = true;
this.updateDom(this.config.animationSpeed);
if (!this.hidden) {
Comment thread
Snille marked this conversation as resolved.
this.show(this.config.animationSpeed, { lockString: this.identifier });
this.loaded = true;
this.updateDom(this.config.animationSpeed);
}
},

/* scheduleUpdate()
Expand Down