diff --git a/CHANGELOG.md b/CHANGELOG.md index 75e54a5d..2d129716 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,13 +19,13 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add `broadcastPastEvents` config option for calendars to include events from the past `maximumNumberOfDays` in event broadcasts - Added feature to broadcast news feed items `NEWS_FEED` and updated news items `NEWS_FEED_UPDATED` in default [newsfeed](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/newsfeed) module (when news is updated) with documented default and `config.js` options in [README.md](https://github.com/MichMich/MagicMirror/blob/develop/modules/default/newsfeed/README.md) - Added notifications to default `clock` module broadcasting `CLOCK_SECOND` and `CLOCK_MINUTE` for the respective time elapsed. - -Added UK Met Office Datapoint feed as a provider in the default weather module. +- Added UK Met Office Datapoint feed as a provider in the default weather module. - added new provider class - added suncalc.js dependency to calculate sun times (not provided in UK Met Office feed) - added "tempUnits" and "windUnits" to allow, for example, temp in metric (i.e. celsius) and wind in imperial (i.e. mph). These will override "units" if specified, otherwise the "units" value will be used. - use Feels Like temp from feed if present - optionally display probability of precipitation (PoP) in current weather (UK Met Office data) +- automatically try to fix eslint errors by passing `--fix` option to it ### Updated - English translation for "Feels" to "Feels like" diff --git a/Gruntfile.js b/Gruntfile.js index 33393af5..ee4ab7b8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,6 +4,7 @@ module.exports = function(grunt) { pkg: grunt.file.readJSON("package.json"), eslint: { options: { + fix: "true", configFile: ".eslintrc.json" }, target: [ diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 1836f51f..cc5084fd 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -135,7 +135,7 @@ Module.register("calendar", { } } else if (notification === "FETCH_ERROR") { Log.error("Calendar Error. Could not fetch calendar: " + payload.url); - this.loaded = true + this.loaded = true; } else if (notification === "INCORRECT_URL") { Log.error("Calendar Error. Incorrect url: " + payload.url); } else { diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js index cb2f5979..87fbcab9 100644 --- a/modules/default/calendar/calendarfetcher.js +++ b/modules/default/calendar/calendarfetcher.js @@ -171,8 +171,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri var geo = event.geo || false; var description = event.description || false; - - if (typeof event.rrule !== 'undefined' && event.rrule !== null && !isFacebookBirthday) { + if (typeof event.rrule !== "undefined" && event.rrule !== null && !isFacebookBirthday) { var rule = event.rrule; var addedEvents = 0; @@ -210,7 +209,6 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri } } - // Loop through the set of date entries to see which recurrences should be added to our event list. for (var d in dates) { var date = dates[d]; @@ -246,7 +244,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri endDate = moment(parseInt(startDate.format("x")) + duration, "x"); if (startDate.format("x") == endDate.format("x")) { - endDate = endDate.endOf("day") + endDate = endDate.endOf("day"); } var recurrenceTitle = getTitleFromEvent(curEvent); diff --git a/modules/default/calendar/node_helper.js b/modules/default/calendar/node_helper.js index 7d644ace..00cb9499 100644 --- a/modules/default/calendar/node_helper.js +++ b/modules/default/calendar/node_helper.js @@ -60,7 +60,7 @@ module.exports = NodeHelper.create({ }); fetcher.onError(function(fetcher, error) { - console.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error) + console.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error); self.sendSocketNotification("FETCH_ERROR", { url: fetcher.url(), error: error diff --git a/modules/default/clock/README.md b/modules/default/clock/README.md index 19e6a005..e1dc0037 100644 --- a/modules/default/clock/README.md +++ b/modules/default/clock/README.md @@ -54,4 +54,4 @@ Current notifications are: | Notification | Description | ----------------- | ----------- | `CLOCK_SECOND` | A second has elapsed.
*Parameter*: second value -| `CLOCK_MINUTE` | A minute has elapsed
*Parameter*: minute value \ No newline at end of file +| `CLOCK_MINUTE` | A minute has elapsed
*Parameter*: minute value diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index e74b525a..502d24b7 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -273,13 +273,13 @@ Module.register("newsfeed",{ newsItems.forEach(value => { if (this.newsItems.findIndex(value1 => value1 === value) === -1) { // Add item to updated items list - updatedItems.push(value) + updatedItems.push(value); } }); // check if updated items exist, if so and if we should broadcast these updates, then lets do so if (this.config.broadcastNewsUpdates && updatedItems.length > 0) { - this.sendNotification("NEWS_FEED_UPDATE", {items: updatedItems}) + this.sendNotification("NEWS_FEED_UPDATE", {items: updatedItems}); } this.newsItems = newsItems; diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js index cc066756..868316d9 100755 --- a/modules/default/weather/weather.js +++ b/modules/default/weather/weather.js @@ -211,7 +211,7 @@ Module.register("weather",{ value = ""; } else { if (this.config.weatherProvider === "ukmetoffice") { - value += "%" + value += "%"; } else { value = `${value.toFixed(2)} ${this.config.units === "imperial" ? "in" : "mm"}`; } diff --git a/modules/default/weather/weatherobject.js b/modules/default/weather/weatherobject.js index d2949ffd..ed455537 100755 --- a/modules/default/weather/weatherobject.js +++ b/modules/default/weather/weatherobject.js @@ -88,7 +88,7 @@ class WeatherObject { feelsLike() { if (this.feelsLikeTemp) { - return this.feelsLikeTemp + return this.feelsLikeTemp; } const windInMph = (this.windUnits === "imperial") ? this.windSpeed : this.windSpeed * 2.23694; const tempInF = this.tempUnits === "imperial" ? this.temperature : this.temperature * 9 / 5 + 32;