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

Merge branch 'develop' of https://github.com/artifactdev/MagicMirror

Browse Source 
# Conflicts:
#	modules/default/calendar/README.md
#	modules/default/weatherforecast/README.md
This commit is contained in:
Jeremias Arnstadt
2017-01-29 00:53:07 +01:00
parent 4214293b76 9bd42ac221
commit bc257f4951
50 changed files with 772 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,7 +154,11 @@ Module.register("weatherforecast",{
if (isNaN(forecast.rain)) {
rainCell.innerHTML = "";
} else {
rainCell.innerHTML = forecast.rain + " mm";
if(config.units !== "imperial") {
rainCell.innerHTML = forecast.rain + " mm";
} else {
rainCell.innerHTML = (parseFloat(forecast.rain) / 25.4).toFixed(2) + " in";
}
}
rainCell.className = "align-right bright rain";
row.appendChild(rainCell);