diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 2d5635af..7cdcf51c 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -182,13 +182,9 @@ Module.register("currentweather",{ weatherIcon.className = "wi weathericon " + this.weatherType; large.appendChild(weatherIcon); - var temp = this.temperature; - if (this.config.roundTemp) { - temp = Math.round(temp); - } var temperature = document.createElement("span"); temperature.className = "bright"; - temperature.innerHTML = " " + temp + "°"; + temperature.innerHTML = " " + this.temperature + "°"; large.appendChild(temperature); wrapper.appendChild(large); @@ -436,6 +432,7 @@ Module.register("currentweather",{ roundValue: function(temperature) { - return parseFloat(temperature).toFixed(1); + var decimals = this.config.roundTemp ? 0 : 1; + return parseFloat(temperature).toFixed(decimals); } }); diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js index 6eba014a..5078c9b6 100644 --- a/modules/default/weatherforecast/weatherforecast.js +++ b/modules/default/weatherforecast/weatherforecast.js @@ -135,20 +135,13 @@ Module.register("weatherforecast",{ icon.className = "wi weathericon " + forecast.icon; iconCell.appendChild(icon); - var maxTemp = forecast.maxTemp; - var minTemp = forecast.minTemp; - if (this.config.roundTemp) { - maxTemp = Math.round(maxTemp); - minTemp = Math.round(minTemp); - } - var maxTempCell = document.createElement("td"); - maxTempCell.innerHTML = maxTemp; + maxTempCell.innerHTML = forecast.maxTemp; maxTempCell.className = "align-right bright max-temp"; row.appendChild(maxTempCell); var minTempCell = document.createElement("td"); - minTempCell.innerHTML = minTemp; + minTempCell.innerHTML = forecast.minTemp; minTempCell.className = "align-right min-temp"; row.appendChild(minTempCell); @@ -351,14 +344,15 @@ Module.register("weatherforecast",{ }, /* function(temperature) - * Rounds a temperature to 1 decimal. + * Rounds a temperature to 1 decimal or integer (depending on config.roundTemp). * * argument temperature number - Temperature. * * return number - Rounded Temperature. */ roundValue: function(temperature) { - return parseFloat(temperature).toFixed(1); + var decimals = this.config.roundTemp ? 0 : 1; + return parseFloat(temperature).toFixed(decimals); } });