kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-01 13:33:15 +00:00
Code Issues Projects Releases Wiki Activity

possible fix #181

Browse Source
This commit is contained in:
Michael Teeuw 2016-04-16 20:01:02 +02:00
parent 44a6604fe8
commit 9c9e93974e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,18 +198,18 @@ Module.register("currentweather",{
this.windSpeed = this.ms2Beaufort(this.roundValue(data.wind.speed)); this.windSpeed = this.ms2Beaufort(this.roundValue(data.wind.speed));
this.weatherType = this.config.iconTable[data.weather[0].icon]; this.weatherType = this.config.iconTable[data.weather[0].icon];
var now = moment().format("x"); var now = moment();
var sunrise = moment(data.sys.sunrise * 1000).format("x"); var sunrise = moment(data.sys.sunrise * 1000);
var sunset = moment(data.sys.sunset * 1000).format("x"); var sunset = moment(data.sys.sunset * 1000);
if (sunrise < now && sunset > now) { if (sunrise < now && sunset > now) {
if (sunrise.isValid()) { if (sunrise.isValid()) {
this.sunriseSunsetTime = moment(data.sys.sunset * 1000).format((this.config.timeFormat === 24) ? "HH:mm" : "hh:mm a"); this.sunriseSunsetTime = sunset.format((this.config.timeFormat === 24) ? "HH:mm" : "hh:mm a");
} }
this.sunriseSunsetIcon = "wi-sunset"; this.sunriseSunsetIcon = "wi-sunset";
} else { } else {
if (sunset.isValid()) { if (sunset.isValid()) {
this.sunriseSunsetTime = moment(data.sys.sunrise * 1000).format((this.config.timeFormat === 24) ? "HH:mm" : "hh:mm a"); this.sunriseSunsetTime = sunrise.format((this.config.timeFormat === 24) ? "HH:mm" : "hh:mm a");
} }
this.sunriseSunsetIcon = "wi-sunrise"; this.sunriseSunsetIcon = "wi-sunrise";