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

Merge conflict.

Browse Source
This commit is contained in:
Michael Teeuw
2019-06-14 13:19:29 +02:00
parent 60b817ec8e 62cb3a610e
commit 7a272ef0ab
70 changed files with 2261 additions and 2633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/default/weather/providers/openweathermap.js
View File

@@ -86,9 +86,9 @@ WeatherProvider.register("openweathermap", {
*/
generateWeatherObjectsFromForecast(forecasts) {
if (this.config.weatherEndpoint == "/forecast") {
if (this.config.weatherEndpoint === "/forecast") {
return this.fetchForecastHourly(forecasts);
} else if (this.config.weatherEndpoint == "/forecast/daily") {
} else if (this.config.weatherEndpoint === "/forecast/daily") {
return this.fetchForecastDaily(forecasts);
}
// if weatherEndpoint does not match forecast or forecast/daily, what should be returned?