kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-05 23:27:40 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
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 option to config the level of logging
- Added prettier for an even cleaner codebase - Added prettier for an even cleaner codebase
- Hide Sunrise/Sunset in Weather module - Hide Sunrise/Sunset in Weather module
- Hide Sunrise/Sunset in Current Weather module
- Added Met Office DataHub (UK) provider - Added Met Office DataHub (UK) provider
### Updated ### Updated

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

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