kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32 from LithiumNL/patch-1

Browse Source 
Update weather.js
This commit is contained in:
Michael Teeuw 2015-11-01 18:45:32 +01:00
commit 067ef7ecba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/weather/weather.js
View File

@ -84,14 +84,14 @@ weather.updateCurrentWeather = function () {
$(this.temperatureLocation).updateWithText(_newTempHtml, this.fadeInterval); $(this.temperatureLocation).updateWithText(_newTempHtml, this.fadeInterval);
var _now = moment(), var _now = moment().format('HH:mm'),
_sunrise = moment(data.sys.sunrise*1000).format('HH:mm'), _sunrise = moment(data.sys.sunrise*1000).format('HH:mm'),
_sunset = moment(data.sys.sunset*1000).format('HH:mm'); _sunset = moment(data.sys.sunset*1000).format('HH:mm');
var _newWindHtml = '<span class="wi wi-strong-wind xdimmed"></span> ' + this.kmh2Beaufort(_wind), var _newWindHtml = '<span class="wi wi-strong-wind xdimmed"></span> ' + this.kmh2Beaufort(_wind),
_newSunHtml = '<span class="wi wi-sunrise xdimmed"></span> ' + _sunrise; _newSunHtml = '<span class="wi wi-sunrise xdimmed"></span> ' + _sunrise;
if (_sunrise < _now && _sunset > now) { if (_sunrise < _now && _sunset > _now) {
_newSunHtml = '<span class="wi wi-sunset xdimmed"></span> ' + _sunset; _newSunHtml = '<span class="wi wi-sunset xdimmed"></span> ' + _sunset;
} }