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

Merge remote-tracking branch 'upstream/develop' into doc-roundValue

Browse Source
This commit is contained in:
Rodrigo Ramírez Norambuena
2017-08-05 18:20:22 -04:00
parent 60c5d96037 6d83f18490
commit ea2f53e166
83 changed files with 2144 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ Module.register("weatherforecast",{
firstEvent: false,
// create a variable to hold the location name based on the API result.
fetchedLocatioName: "",
fetchedLocationName: "",
// Define required scripts.
getScripts: function() {
@@ -77,8 +77,8 @@ Module.register("weatherforecast",{
// Define required translations.
getTranslations: function() {
// The translations for the defaut modules are defined in the core translation files.
// Therefor we can just return false. Otherwise we should have returned a dictionairy.
// The translations for the default modules are defined in the core translation files.
// Therefor we can just return false. Otherwise we should have returned a dictionary.
// If you're trying to build yiur own module including translations, check out the documentation.
return false;
},
@@ -175,7 +175,6 @@ Module.register("weatherforecast",{
row.style.opacity = 1 - (1 / steps * currentStep);
}
}
}
return table;
@@ -184,7 +183,7 @@ Module.register("weatherforecast",{
// Override getHeader method.
getHeader: function() {
if (this.config.appendLocationNameToHeader) {
return this.data.header + " " + this.fetchedLocatioName;
return this.data.header + " " + this.fetchedLocationName;
}
return this.data.header;
@@ -200,10 +199,9 @@ Module.register("weatherforecast",{
if (notification === "CALENDAR_EVENTS") {
var senderClasses = sender.data.classes.toLowerCase().split(" ");
if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) {
var lastEvent = this.firstEvent;
this.firstEvent = false;
for (e in payload) {
for (var e in payload) {
var event = payload[e];
if (event.location || event.geo) {
this.firstEvent = event;
@@ -291,7 +289,7 @@ Module.register("weatherforecast",{
* argument data object - Weather information received form openweather.org.
*/
processWeather: function(data) {
this.fetchedLocatioName = data.city.name + ", " + data.city.country;
this.fetchedLocationName = data.city.name + ", " + data.city.country;
this.forecast = [];
for (var i = 0, count = data.list.length; i < count; i++) {
@@ -335,6 +333,10 @@ Module.register("weatherforecast",{
/* ms2Beaufort(ms)
* Converts m2 to beaufort (windspeed).
*
* see:
* http://www.spc.noaa.gov/faq/tornado/beaufort.html
* https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale
*
* argument ms number - Windspeed in m/s.
*
* return number - Windspeed in beaufort.