kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 04:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into package_updates

Browse Source
This commit is contained in:
Michael Teeuw 2017-05-26 14:42:24 +02:00 committed by GitHub
commit a9c2c2178a
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/loader.js
View File

@ -32,8 +32,8 @@ var Loader = (function() {
}); });
} else { } else {
// All modules loaded. Load custom.css // All modules loaded. Load custom.css
// This is done after all the moduels so we can // This is done after all the modules so we can
// overwrite all the defined styls. // overwrite all the defined styles.
loadFile("css/custom.css", function() { loadFile("css/custom.css", function() {
// custom.css loaded. Start all modules. // custom.css loaded. Start all modules.

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

@ -412,6 +412,10 @@ Module.register("currentweather",{
/* ms2Beaufort(ms) /* ms2Beaufort(ms)
* Converts m2 to beaufort (windspeed). * 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. * argument ms number - Windspeed in m/s.
* *
* return number - Windspeed in beaufort. * return number - Windspeed in beaufort.

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

@ -335,6 +335,10 @@ Module.register("weatherforecast",{
/* ms2Beaufort(ms) /* ms2Beaufort(ms)
* Converts m2 to beaufort (windspeed). * 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. * argument ms number - Windspeed in m/s.
* *
* return number - Windspeed in beaufort. * return number - Windspeed in beaufort.

1
package.json
View File

@ -63,6 +63,7 @@
"rrule-alt": "^2.2.5", "rrule-alt": "^2.2.5",
"simple-git": "^1.73.0", "simple-git": "^1.73.0",
"socket.io": "^2.0.1", "socket.io": "^2.0.1",
"stylelint": "^7.10.1",
"valid-url": "latest", "valid-url": "latest",
"walk": "latest" "walk": "latest"
} }

10
tests/e2e/modules/clock_spec.js
View File

@ -121,10 +121,12 @@ describe("Clock module", function () {
}); });
it("shows week with correct number of week of year", function() { it("shows week with correct number of week of year", function() {
const currentWeekNumber = require("current-week-number")();
const weekToShow = "Week " + currentWeekNumber; it("FIXME: if the day is a sunday this not match");
return app.client.waitUntilWindowLoaded() // const currentWeekNumber = require("current-week-number")();
.getText(".clock .week").should.eventually.equal(weekToShow); // const weekToShow = "Week " + currentWeekNumber;
// return app.client.waitUntilWindowLoaded()
// .getText(".clock .week").should.eventually.equal(weekToShow);
}); });
}); });