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 #1996 from rejas/eslint_recommend

Browse Source 
Update eslint config to use eslint:recommended
This commit is contained in:
Michael Teeuw 2020-04-23 10:23:40 +02:00 committed by GitHub
commit 3c54d4af15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 279 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.eslintrc.json
View File

@ -1,20 +1,10 @@
{
"rules": {
"indent": ["error", "tab"],
"quotes": ["error", "double"],
"semi": ["error"],
"max-len": ["error", 250],
"curly": "error",
"camelcase": ["error", {"properties": "never"}],
"no-multiple-empty-lines": ["error", { "max": 1, "maxEOF": 1 }],
"no-multi-spaces": "error",
"no-trailing-spaces": ["error", {"ignoreComments": false }],
"no-irregular-whitespace": ["error"]
},
"extends": "eslint:recommended",
"env": {
"browser": true,
"node": true,
"es6": true
"es6": true,
"mocha": true,
"node": true
},
"parserOptions": {
"sourceType": "module",
@ -22,5 +12,11 @@
"ecmaFeatures": {
"globalReturn": true
}
}
},
"rules": {
"eqeqeq": "error",
"no-prototype-builtins": "off",
"no-undef": "off",
"no-unused-vars": "off"
}
}

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Cleaned up alert module code
- Cleaned up check_config code
- Replaced grunt-based linters with their non-grunt equivalents
- Switch to most of the eslint:recommended rules and fix warnings
### Deleted
- Removed truetype (ttf) fonts

33
config/config.js.sample
View File

@ -9,19 +9,19 @@
*/
var config = {
address: "localhost", // Address to listen on, can be:
// - "localhost", "127.0.0.1", "::1" to listen on loopback interface
// - another specific IPv4/6 to listen on a specific interface
// - "0.0.0.0", "::" to listen on any interface
// Default, when address config is left out or empty, is "localhost"
address: "localhost", // Address to listen on, can be:
// - "localhost", "127.0.0.1", "::1" to listen on loopback interface
// - another specific IPv4/6 to listen on a specific interface
// - "0.0.0.0", "::" to listen on any interface
// Default, when address config is left out or empty, is "localhost"
port: 8080,
basePath: "/", // The URL path where MagicMirror is hosted. If you are using a Reverse proxy
// you must set the sub path here. basePath must end with a /
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses
// or add a specific IPv4 of 192.168.1.5 :
// ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],
// or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format :
// ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"],
basePath: "/", // The URL path where MagicMirror is hosted. If you are using a Reverse proxy
// you must set the sub path here. basePath must end with a /
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses
// or add a specific IPv4 of 192.168.1.5 :
// ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],
// or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format :
// ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"],
useHttps: false, // Support HTTPS or not, default "false" will use HTTP
httpsPrivateKey: "", // HTTPS private key path, only require when useHttps is true
@ -31,10 +31,10 @@ var config = {
timeFormat: 24,
units: "metric",
// serverOnly: true/false/"local" ,
// local for armv6l processors, default
// starts serveronly and then starts chrome browser
// false, default for all NON-armv6l devices
// true, force serveronly mode, because you want to.. no UI on this device
// local for armv6l processors, default
// starts serveronly and then starts chrome browser
// false, default for all NON-armv6l devices
// true, force serveronly mode, because you want to.. no UI on this device
modules: [
{
@ -100,7 +100,6 @@ var config = {
}
},
]
};
/*************** DO NOT EDIT THE LINE BELOW ***************/

2
js/app.js
View File

@ -61,7 +61,7 @@ var App = function() {
// https://forum.magicmirror.builders/topic/1456/test-suite-for-magicmirror/8
var configFilename = path.resolve(global.root_path + "/config/config.js");
if (typeof(global.configuration_file) !== "undefined") {
configFilename = path.resolve(global.configuration_file);
configFilename = path.resolve(global.configuration_file);
}
try {

4
js/class.js
View File

@ -22,8 +22,8 @@
initializing = false;
// Make a copy of all prototype properties, to prevent reference issues.
for (var name in prototype) {
prototype[name] = cloneObject(prototype[name]);
for (var p in prototype) {
prototype[p] = cloneObject(prototype[p]);
}
// Copy the properties over onto the new prototype

2
js/defaults.js
View File

@ -1,7 +1,7 @@
/* exported defaults */
/* Magic Mirror
* Config Defauls
* Config Defaults
*
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.

2
js/loader.js
View File

@ -1,11 +1,11 @@
/* global config, vendor, MM, Log, Module */
/* Magic Mirror
* Module and File loaders.
*
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
*/
var Loader = (function() {
/* Create helper variables */

1
js/logger.js
View File

@ -1,4 +1,3 @@
/* global console */
/* exported Log */
/* Magic Mirror

6
js/main.js
View File

@ -1,4 +1,4 @@
/* global Log, Loader, Module, config, defaults */
/* global Log, Loader, Module, config, defaults */
/* Magic Mirror
* Main System
@ -6,7 +6,6 @@
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
*/
var MM = (function() {
var modules = [];
@ -344,6 +343,8 @@ var MM = (function() {
* Loads the core config and combines it with de system defaults.
*/
var loadConfig = function() {
// FIXME: Think about how to pass config around without breaking tests
/* eslint-disable */
if (typeof config === "undefined") {
config = defaults;
Log.error("Config file is missing! Please create a config file.");
@ -351,6 +352,7 @@ var MM = (function() {
}
config = Object.assign({}, defaults, config);
/* eslint-enable */
};
/* setSelectionMethodsForModules()

1
js/module.js
View File

@ -1,4 +1,3 @@
/* global Log, Class, Loader, Class , MM */
/* exported Module */
/* Magic Mirror

2
js/server.js
View File

@ -73,7 +73,7 @@ var Server = function(config, callback) {
configFile = "config/config.js";
if (typeof(global.configuration_file) !== "undefined") {
configFile = global.configuration_file;
configFile = global.configuration_file;
}
html = html.replace("#CONFIG_FILE#", configFile);

2
js/socket.js
View File

@ -1,5 +1,3 @@
/* exported Log */
/* Magic Mirror
* Socket Connection
*

5
js/translator.js
View File

@ -1,4 +1,5 @@
/* exported Translator */
/* Magic Mirror
* Translator (l10n)
*
@ -129,10 +130,10 @@ var Translator = (function() {
if(Object.prototype.toString.call(template) !== "[object String]") {
return template;
}
if(variables.fallback && !template.match(new RegExp("\{.+\}"))) {
if(variables.fallback && !template.match(new RegExp("{.+}"))) {
template = variables.fallback;
}
return template.replace(new RegExp("\{([^\}]+)\}", "g"), function(_unused, varName){
return template.replace(new RegExp("{([^}]+)}", "g"), function(_unused, varName){
return variables[varName] || "{"+varName+"}";
});
}

1
js/utils.js
View File

@ -1,4 +1,5 @@
/* exported Utils */
/* Magic Mirror
* Utils
*

1
modules/default/alert/alert.js
View File

@ -6,7 +6,6 @@
* By Paul-Vincent Roll http://paulvincentroll.com
* MIT Licensed.
*/
Module.register("alert",{
defaults: {
// scale|slide|genie|jelly|flip|bouncyflip|exploader

2
modules/default/alert/notificationFx.js
View File

@ -10,7 +10,7 @@
* Copyright 2014, Codrops
* http://www.codrops.com
*/
;(function(window) {
(function(window) {
/**
* extend obj function

25
modules/default/calendar/calendar.js
View File

@ -6,7 +6,6 @@
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
*/
Module.register("calendar", {
// Define module defaults
@ -254,6 +253,8 @@ Module.register("calendar", {
titleWrapper.className = "title " + titleClass;
}
var timeWrapper;
if(this.config.timeFormat === "dateheaders"){
if (event.fullDayEvent) {
@ -261,10 +262,8 @@ Module.register("calendar", {
titleWrapper.align = "left";
} else {
var timeClass = this.timeClassForUrl(event.url);
var timeWrapper = document.createElement("td");
timeWrapper.className = "time light " + timeClass;
timeWrapper = document.createElement("td");
timeWrapper.className = "time light " + this.timeClassForUrl(event.url);
timeWrapper.align = "left";
timeWrapper.style.paddingLeft = "2px";
timeWrapper.innerHTML = moment(event.startDate, "x").format("LT");
@ -274,7 +273,7 @@ Module.register("calendar", {
eventWrapper.appendChild(titleWrapper);
} else {
var timeWrapper = document.createElement("td");
timeWrapper = document.createElement("td");
eventWrapper.appendChild(titleWrapper);
//console.log(event.today);
@ -370,8 +369,7 @@ Module.register("calendar", {
}
//timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll');
//console.log(event);
var timeClass = this.timeClassForUrl(event.url);
timeWrapper.className = "time light " + timeClass;
timeWrapper.className = "time light " + this.timeClassForUrl(event.url);
eventWrapper.appendChild(timeWrapper);
}
@ -424,15 +422,12 @@ Module.register("calendar", {
switch (timeFormat) {
case 12: {
return { longDateFormat: {LT: "h:mm A"} };
break;
}
case 24: {
return { longDateFormat: {LT: "HH:mm"} };
break;
}
default: {
return { longDateFormat: {LT: moment.localeData().longDateFormat("LT")} };
break;
}
}
},
@ -474,8 +469,8 @@ Module.register("calendar", {
}
if(this.config.hidePrivate) {
if(event.class === "PRIVATE") {
// do not add the current event, skip it
continue;
// do not add the current event, skip it
continue;
}
}
if(this.config.hideOngoing) {
@ -734,8 +729,8 @@ Module.register("calendar", {
var regParts = needle.match(/^\/(.+)\/([gim]*)$/);
if (regParts) {
// the parsed pattern is a regexp.
needle = new RegExp(regParts[1], regParts[2]);
// the parsed pattern is a regexp.
needle = new RegExp(regParts[1], regParts[2]);
}
title = title.replace(needle, replacement);

13
modules/default/calendar/calendarfetcher.js
View File

@ -81,8 +81,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
past = moment().startOf("day").subtract(maximumNumberOfDays, "days").toDate();
}
// FIXME:
// Ugly fix to solve the facebook birthday issue.
// FIXME: Ugly fix to solve the facebook birthday issue.
// Otherwise, the recurring events only show the birthday for next year.
var isFacebookBirthday = false;
if (typeof event.uid !== "undefined") {
@ -200,7 +199,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
// because the logic below will filter out any recurrences that don"t actually belong within
// our display range.
// Would be great if there was a better way to handle this.
if (event.recurrences != undefined)
if (event.recurrences !== undefined)
{
var pastMoment = moment(past);
var futureMoment = moment(future);
@ -209,7 +208,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
{
// Only add dates that weren't already in the range we added from the rrule so that
// we don"t double-add those events.
if (moment(new Date(r)).isBetween(pastMoment, futureMoment) != true)
if (moment(new Date(r)).isBetween(pastMoment, futureMoment) !== true)
{
dates.push(new Date(r));
}
@ -235,7 +234,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
startDate = moment(date);
// For each date that we"re checking, it"s possible that there is a recurrence override for that one day.
if ((curEvent.recurrences != undefined) && (curEvent.recurrences[dateKey] != undefined))
if ((curEvent.recurrences !== undefined) && (curEvent.recurrences[dateKey] !== undefined))
{
// We found an override, so for this recurrence, use a potentially different title, start date, and duration.
curEvent = curEvent.recurrences[dateKey];
@ -243,14 +242,14 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
duration = parseInt(moment(curEvent.end).format("x")) - parseInt(startDate.format("x"));
}
// If there"s no recurrence override, check for an exception date. Exception dates represent exceptions to the rule.
else if ((curEvent.exdate != undefined) && (curEvent.exdate[dateKey] != undefined))
else if ((curEvent.exdate !== undefined) && (curEvent.exdate[dateKey] !== undefined))
{
// This date is an exception date, which means we should skip it in the recurrence pattern.
showRecurrence = false;
}
endDate = moment(parseInt(startDate.format("x")) + duration, "x");
if (startDate.format("x") == endDate.format("x")) {
if (startDate.format("x") === endDate.format("x")) {
endDate = endDate.endOf("day");
}

4
modules/default/clock/clock.js
View File

@ -1,4 +1,5 @@
/* global Log, Module, moment, config */
/* Magic Mirror
* Module: Clock
*
@ -198,11 +199,10 @@ Module.register("clock",{
* Create wrappers for ANALOG clock, only if specified in config
*/
if (this.config.displayType !== "digital") {
if (this.config.displayType !== "digital") {
// If it isn't 'digital', then an 'analog' clock was also requested
// Calculate the degree offset for each hand of the clock
var now = moment();
if (this.config.timezone) {
now.tz(this.config.timezone);
}

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

@ -6,7 +6,6 @@
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
*/
Module.register("currentweather",{
// Default module config.
@ -23,7 +22,6 @@ Module.register("currentweather",{
showWindDirection: true,
showWindDirectionAsArrow: false,
useBeaufort: true,
appendLocationNameToHeader: false,
useKMPHwind: false,
lang: config.language,
decimalSymbol: ".",
@ -150,15 +148,15 @@ Module.register("currentweather",{
var humidity = document.createElement("span");
humidity.innerHTML = this.humidity;
var spacer = document.createElement("sup");
spacer.innerHTML = " ";
var supspacer = document.createElement("sup");
supspacer.innerHTML = " ";
var humidityIcon = document.createElement("sup");
humidityIcon.className = "wi wi-humidity humidityIcon";
humidityIcon.innerHTML = " ";
small.appendChild(humidity);
small.appendChild(spacer);
small.appendChild(supspacer);
small.appendChild(humidityIcon);
}
@ -414,8 +412,7 @@ Module.register("currentweather",{
case "imperial": tempInF = this.temperature;
break;
case "default":
var tc = this.temperature - 273.15;
tempInF = 1.8 * tc + 32;
tempInF = 1.8 * (this.temperature - 273.15) + 32;
break;
}
@ -431,8 +428,7 @@ Module.register("currentweather",{
case "imperial": this.feelsLike = windChillInF.toFixed(0);
break;
case "default":
var tc = windChillInC + 273.15;
this.feelsLike = tc.toFixed(0);
this.feelsLike = (windChillInC + 273.15).toFixed(0);
break;
}

1
modules/default/helloworld/helloworld.js
View File

@ -6,7 +6,6 @@
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
*/
Module.register("helloworld",{
// Default module config.

4
modules/default/newsfeed/newsfeed.js
View File

@ -6,7 +6,6 @@
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
*/
Module.register("newsfeed",{
// Default module config.
@ -367,8 +366,8 @@ Module.register("newsfeed",{
},
notificationReceived: function(notification, payload, sender) {
var before = this.activeItem;
if(notification === "ARTICLE_NEXT"){
var before = this.activeItem;
this.activeItem++;
if (this.activeItem >= this.newsItems.length) {
this.activeItem = 0;
@ -377,7 +376,6 @@ Module.register("newsfeed",{
Log.info(this.name + " - going from article #" + before + " to #" + this.activeItem + " (of " + this.newsItems.length + ")");
this.updateDom(100);
} else if(notification === "ARTICLE_PREVIOUS"){
var before = this.activeItem;
this.activeItem--;
if (this.activeItem < 0) {
this.activeItem = this.newsItems.length - 1;

20
modules/default/updatenotification/updatenotification.js
View File

@ -1,3 +1,11 @@
/* global Module */
/* Magic Mirror
* Module: UpdateNotification
*
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
*/
Module.register("updatenotification", {
defaults: {
@ -33,16 +41,16 @@ Module.register("updatenotification", {
var self = this;
if (payload && payload.behind > 0) {
// if we haven't seen info for this module
if(this.moduleList[payload.module] == undefined){
if(this.moduleList[payload.module] === undefined){
// save it
this.moduleList[payload.module]=payload;
self.updateDom(2);
}
//self.show(1000, { lockString: self.identifier });
} else if (payload && payload.behind == 0){
} else if (payload && payload.behind === 0){
// if the module WAS in the list, but shouldn't be
if(this.moduleList[payload.module] != undefined){
if(this.moduleList[payload.module] !== undefined){
// remove it
delete this.moduleList[payload.module];
self.updateDom(2);
@ -64,7 +72,7 @@ Module.register("updatenotification", {
// Override dom generator.
getDom: function () {
var wrapper = document.createElement("div");
if(this.suspended==false){
if(this.suspended === false){
// process the hash of module info found
for(key of Object.keys(this.moduleList)){
let m= this.moduleList[key];
@ -77,7 +85,7 @@ Module.register("updatenotification", {
icon.innerHTML = "&nbsp;";
message.appendChild(icon);
var updateInfoKeyName = m.behind == 1 ? "UPDATE_INFO_SINGLE" : "UPDATE_INFO_MULTIPLE";
var updateInfoKeyName = m.behind === 1 ? "UPDATE_INFO_SINGLE" : "UPDATE_INFO_MULTIPLE";
var subtextHtml = this.translate(updateInfoKeyName, {
COMMIT_COUNT: m.behind,
@ -85,7 +93,7 @@ Module.register("updatenotification", {
});
var text = document.createElement("span");
if (m.module == "default") {
if (m.module === "default") {
text.innerHTML = this.translate("UPDATE_NOTIFICATION");
subtextHtml = this.diffLink(m,subtextHtml);
} else {

2
modules/default/weather/README.md
View File

@ -1,5 +1,5 @@
# Weather Module
This module is aimed to be the replacement for the current `currentweather` and `weatherforcast` modules. The module will be configurable to be used as a current weather view, or to show the forecast. This way the module can be used twice to fullfil both purposes.
This module aims to be the replacement for the current `currentweather` and `weatherforcast` modules. The module will be configurable to be used as a current weather view, or to show the forecast. This way the module can be used twice to fullfil both purposes.
For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/weather.html).

4
modules/default/weather/providers/README.md
View File

@ -13,7 +13,7 @@ Table of Contents:
## The weather provider file: yourprovider.js
This is the script in which the weather provider will be defined. In it's most simple form, the weather provider must implement the following:
This is the script in which the weather provider will be defined. In its most simple form, the weather provider must implement the following:
````javascript
WeatherProvider.register("yourprovider", {
@ -36,7 +36,7 @@ It will then automatically refresh the module DOM with the new data.
#### `fetchWeatherForecast()`
This method is called when the weather module tries to fetch the weather weather of your provider. The implementation of this method is required.
This method is called when the weather module tries to fetch the weather of your provider. The implementation of this method is required.
The implementation can make use of the already implemented function `this.fetchData(url, method, data);`, which is returning a promise.
After the response is processed, the weather forecast information (as an array of [WeatherObject](#weatherobject)s) needs to be set with `this.setCurrentWeather(forecast);`.
It will then automatically refresh the module DOM with the new data.

2
modules/default/weather/providers/darksky.js
View File

@ -1,4 +1,4 @@
/* global WeatherProvider, WeatherDay */
/* global WeatherProvider */
/* Magic Mirror
* Module: Weather

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

@ -8,7 +8,6 @@
*
* This class is the blueprint for a weather provider.
*/
WeatherProvider.register("openweathermap", {
// Set the name of the provider.

7
modules/default/weather/providers/ukmetoffice.js
View File

@ -8,7 +8,6 @@
*
* This class is a provider for UK Met Office Datapoint.
*/
WeatherProvider.register("ukmetoffice", {
// Set the name of the provider.
@ -25,8 +24,7 @@ WeatherProvider.register("ukmetoffice", {
fetchCurrentWeather() {
this.fetchData(this.getUrl("3hourly"))
.then(data => {
if (!data || !data.SiteRep || !data.SiteRep.DV || !data.SiteRep.DV.Location ||
!data.SiteRep.DV.Location.Period || data.SiteRep.DV.Location.Period.length == 0) {
if (!data || !data.SiteRep || !data.SiteRep.DV || !data.SiteRep.DV.Location || !data.SiteRep.DV.Location.Period || data.SiteRep.DV.Location.Period.length === 0) {
// Did not receive usable new data.
// Maybe this needs a better check?
return;
@ -47,8 +45,7 @@ WeatherProvider.register("ukmetoffice", {
fetchWeatherForecast() {
this.fetchData(this.getUrl("daily"))
.then(data => {
if (!data || !data.SiteRep || !data.SiteRep.DV || !data.SiteRep.DV.Location ||
!data.SiteRep.DV.Location.Period || data.SiteRep.DV.Location.Period.length == 0) {
if (!data || !data.SiteRep || !data.SiteRep.DV || !data.SiteRep.DV.Location || !data.SiteRep.DV.Location.Period || data.SiteRep.DV.Location.Period.length === 0) {
// Did not receive usable new data.
// Maybe this needs a better check?
return;

1
modules/default/weather/providers/weathergov.js
View File

@ -11,7 +11,6 @@
* Note that this is only for US locations (lat and lon) and does not require an API key
* Since it is free, there are some items missing - like sunrise, sunset, humidity, etc.
*/
WeatherProvider.register("weathergov", {
// Set the name of the provider.

8
modules/default/weather/weather.js
View File

@ -6,11 +6,9 @@
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
*/
Module.register("weather",{
// Default module config.
defaults: {
updateInterval: 10 * 60 * 1000,
weatherProvider: "openweathermap",
roundTemp: false,
type: "current", //current, forecast
@ -210,11 +208,11 @@ Module.register("weather",{
if (isNaN(value) || value === 0 || value.toFixed(2) === "0.00") {
value = "";
} else {
if (this.config.weatherProvider === "ukmetoffice") {
if (this.config.weatherProvider === "ukmetoffice") {
value += "%";
} else {
} else {
value = `${value.toFixed(2)} ${this.config.units === "imperial" ? "in" : "mm"}`;
}
}
}
} else if (type === "humidity") {
value += "%";

13
modules/default/weather/weatherobject.js
View File

@ -1,5 +1,3 @@
/* global Class */
/* Magic Mirror
* Module: Weather
*
@ -7,11 +5,10 @@
* MIT Licensed.
*
* This class is the blueprint for a day which includes weather information.
*
* Currently this is focused on the information which is necessary for the current weather.
* As soon as we start implementing the forecast, mode properties will be added.
*/
// Currently this is focused on the information which is necessary for the current weather.
// As soon as we start implementing the forecast, mode properties will be added.
class WeatherObject {
constructor(units, tempUnits, windUnits) {
@ -87,8 +84,8 @@ class WeatherObject {
}
feelsLike() {
if (this.feelsLikeTemp) {
return this.feelsLikeTemp;
if (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;

4
modules/default/weather/weatherprovider.js
View File

@ -8,10 +8,6 @@
*
* This class is the blueprint for a weather provider.
*/
/**
* Base BluePrint for the WeatherProvider
*/
var WeatherProvider = Class.extend({
// Weather Provider Properties
providerName: null,

15
modules/default/weatherforecast/weatherforecast.js
View File

@ -6,7 +6,6 @@
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
*/
Module.register("weatherforecast",{
// Default module config.
@ -62,7 +61,7 @@ Module.register("weatherforecast",{
},
},
// create a variable for the first upcoming calendaar event. Used if no location is specified.
// create a variable for the first upcoming calendar event. Used if no location is specified.
firstEvent: false,
// create a variable to hold the location name based on the API result.
@ -310,7 +309,7 @@ Module.register("weatherforecast",{
* parserDataWeather(data)
*
* Use the parse to keep the same struct between daily and forecast Endpoint
* from Openweather
* from openweather.org
*
*/
parserDataWeather: function(data) {
@ -339,7 +338,7 @@ Module.register("weatherforecast",{
var day;
var hour;
if(!!forecast.dt_txt) {
if(forecast.dt_txt) {
day = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("ddd");
hour = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("H");
} else {
@ -348,7 +347,7 @@ Module.register("weatherforecast",{
}
if (day !== lastDay) {
var forecastData = {
forecastData = {
day: day,
icon: this.config.iconTable[forecast.weather[0].icon],
maxTemp: this.roundValue(forecast.temp.max),
@ -450,14 +449,14 @@ Module.register("weatherforecast",{
}
//Find all forecasts that is for the same day
var checkDateTime = (!!forecast.dt_txt) ? moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss") : moment(forecast.dt, "X");
var checkDateTime = (forecast.dt_txt) ? moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss") : moment(forecast.dt, "X");
var daysForecasts = allForecasts.filter(function(item) {
var itemDateTime = (!!item.dt_txt) ? moment(item.dt_txt, "YYYY-MM-DD hh:mm:ss") : moment(item.dt, "X");
var itemDateTime = (item.dt_txt) ? moment(item.dt_txt, "YYYY-MM-DD hh:mm:ss") : moment(item.dt, "X");
return itemDateTime.isSame(checkDateTime, "day") && item.rain instanceof Object;
});
//If no rain this day return undefined so it wont be displayed for this day
if (daysForecasts.length == 0) {
if (daysForecasts.length === 0) {
return undefined;
}

477
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
package.json
View File

@ -44,20 +44,19 @@
"homepage": "https://magicmirror.builders",
"devDependencies": {
"@prantlf/jsonlint": "^10.2.0",
"chai": "^4.1.2",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"current-week-number": "^1.0.7",
"danger": "^3.1.3",
"eslint": "^6.8.0",
"http-auth": "^3.2.3",
"jsdom": "^11.6.2",
"markdownlint": "^0.20.1",
"markdownlint-cli": "^0.22.0",
"mocha": "^7.0.0",
"mocha-each": "^1.1.0",
"mocha": "^7.1.1",
"mocha-each": "^2.0.1",
"mocha-logger": "^1.0.6",
"spectron": "^8.0.0",
"stylelint": "^13.3.2",
"stylelint": "^13.3.3",
"stylelint-config-standard": "^20.0.0",
"yaml-lint": "^1.2.4"
},
@ -67,6 +66,7 @@
"dependencies": {
"colors": "^1.1.2",
"console-stamp": "^0.2.9",
"eslint": "^6.8.0",
"express": "^4.16.2",
"express-ipfilter": "^1.0.1",
"feedme": "latest",

2
tests/configs/modules/calendar/old-basic-auth.js
View File

@ -1,5 +1,5 @@
/* Magic Mirror Test config default calendar
* with authenticacion old config
* with authentication old config
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/

5
tests/configs/modules/clock/es/clock_showWeek.js
View File

@ -1,7 +1,4 @@
/* Magic Mirror
*
* Test config for default clock module
/* Magic Mirror Test config for default clock module
* Language es for showWeek feature
*
* By Rodrigo Ramírez Norambuena

4
tests/configs/modules/helloworld/helloworld_default.js
View File

@ -1,6 +1,4 @@
/* Magic Mirror
*
* Test config sample module hello world default config
/* Magic Mirror Test config sample module hello world default config
*
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.

2
tests/configs/modules/positions.js
View File

@ -9,7 +9,6 @@
var config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
ipWhitelist: [],
language: "en",
timeFormat: 24,
@ -19,6 +18,7 @@ var config = {
nodeIntegration: true,
},
},
modules:
// Using exotic content. This is why dont accept go to JSON configuration file
(function() {

5
tests/e2e/dev_console.js
View File

@ -5,11 +5,11 @@ const describe = global.describe;
const it = global.it;
describe("Development console tests", function() {
// This tests fail and crash another tests
// FIXME: This tests fail and crash another tests
// Suspect problem with window focus
// FIXME
return false;
/* eslint-disable */
helpers.setupTimeout(this);
var app = null;
@ -58,4 +58,5 @@ describe("Development console tests", function() {
return expect(app.browserWindow.isDevToolsOpened()).to.eventually.equal(true);
});
});
/* eslint-enable */
});