Merge branch 'develop' of https://github.com/MichMich/MagicMirror into bryanzzhu-weather

This commit is contained in:
Bryan Zhu 2020-07-01 08:38:46 -04:00
commit 5bb72cfed8
2 changed files with 10 additions and 6 deletions

View File

@ -14,6 +14,7 @@ _This release is scheduled to be released on 2020-07-01._
- Added option to config the level of logging
- Added prettier for an even cleaner codebase
- Hide Sunrise/Sunset in Weather module
- Hide Sunrise/Sunset in Current Weather module
- Added Met Office DataHub (UK) provider
### Updated

View File

@ -23,6 +23,7 @@ Module.register("currentweather", {
lang: config.language,
decimalSymbol: ".",
showHumidity: false,
showSun: true,
degreeLabel: false,
showIndoorTemperature: false,
showIndoorHumidity: false,
@ -155,13 +156,15 @@ Module.register("currentweather", {
small.appendChild(humidityIcon);
}
var sunriseSunsetIcon = document.createElement("span");
sunriseSunsetIcon.className = "wi dimmed " + this.sunriseSunsetIcon;
small.appendChild(sunriseSunsetIcon);
if (this.config.showSun) {
var sunriseSunsetIcon = document.createElement("span");
sunriseSunsetIcon.className = "wi dimmed " + this.sunriseSunsetIcon;
small.appendChild(sunriseSunsetIcon);
var sunriseSunsetTime = document.createElement("span");
sunriseSunsetTime.innerHTML = " " + this.sunriseSunsetTime;
small.appendChild(sunriseSunsetTime);
var sunriseSunsetTime = document.createElement("span");
sunriseSunsetTime.innerHTML = " " + this.sunriseSunsetTime;
small.appendChild(sunriseSunsetTime);
}
wrapper.appendChild(small);
},