From 36400c0a8340c7b8f0c4b780c55aedf06563ca21 Mon Sep 17 00:00:00 2001 From: Veeck Date: Fri, 14 Jun 2019 14:03:07 +0200 Subject: [PATCH] Fix some eslint errors from previous merges --- modules/default/calendar/calendar.js | 2 +- modules/default/calendar/calendarfetcher.js | 6 ++---- modules/default/calendar/node_helper.js | 2 +- modules/default/newsfeed/newsfeed.js | 4 ++-- modules/default/weather/weather.js | 2 +- modules/default/weather/weatherobject.js | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) 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/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;