kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 04:45:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into bryanzzhu-weather

Browse Source
This commit is contained in:
Michael Teeuw
2020-09-18 12:15:44 +02:00
committed by GitHub
parent 3901543697 f9bf17d701
commit 207a9ba723
33 changed files with 767 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/default/weather/weather.js
View File

@@ -76,11 +76,12 @@ Module.register("weather", {
// Override getHeader method.
getHeader: function () {
if (this.config.appendLocationNameToHeader && this.data.header !== undefined && this.weatherProvider) {
return this.data.header + " " + this.weatherProvider.fetchedLocation();
if (this.config.appendLocationNameToHeader && this.weatherProvider) {
if (this.data.header) return this.data.header + " " + this.weatherProvider.fetchedLocation();
else return this.weatherProvider.fetchedLocation();
}
return this.data.header;
return this.data.header ? this.data.header : "";
},
// Start the weather module.