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

Merge pull request #1512 from fwitte/features/currentweather_weatherforecost_degreesign

Browse Source 
still show degree sign if degreeLabel/scale is false
This commit is contained in:
Michael Teeuw
2019-01-08 09:36:26 +01:00
committed by GitHub
parent 50545a83b8 c2ff949f2d
commit 0a340d5d57
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,16 +198,19 @@ Module.register("currentweather",{
large.appendChild(weatherIcon);
var degreeLabel = "";
if (this.config.degreeLabel) {
switch (this.config.units ) {
if (this.config.units === "metric" || this.config.units === "imperial") {
degreeLabel += "°";
}
if(this.config.degreeLabel) {
switch(this.config.units) {
case "metric":
degreeLabel = " °C";
degreeLabel += "C";
break;
case "imperial":
degreeLabel = " °F";
degreeLabel += "F";
break;
case "default":
degreeLabel = " K";
degreeLabel += "K";
break;
}
}

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

@@ -143,16 +143,19 @@ Module.register("weatherforecast",{
iconCell.appendChild(icon);
var degreeLabel = "";
if (this.config.units === "metric" || this.config.units === "imperial") {
degreeLabel += "°";
}
if(this.config.scale) {
switch(this.config.units) {
case "metric":
degreeLabel = " °C";
degreeLabel += "C";
break;
case "imperial":
degreeLabel = " °F";
degreeLabel += "F";
break;
case "default":
degreeLabel = " K";
degreeLabel = "K";
break;
}
}