Merge branch 'develop' into newscripts

.travis.yml

@@ -1,7 +1,8 @@
 dist: trusty
 language: node_js
 node_js:
- - "8"
+ - "10"
+
 before_script:
  - yarn danger ci
  - npm install grunt-cli -g

CHANGELOG.md

@@ -11,7 +11,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - updated raspberry.sh installer script to handle new platform issues, split node/npm, pm2, and screen saver changes
 - improve handling for armv6l devices, where electron support has gone away, add optional serveronly config option
 - improved run-start.sh to handle for serveronly mode, by choice, or when electron not available
-
+- change electron version 
 ---
 
 ❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² core.
@@ -22,12 +22,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 - Timestamps in log output
+- Padding in dateheader mode of the calendar module 
 
 ### Updated
 
 ### Fixed
 - Fixed issue in weatherforecast module where predicted amount of rain was not using the decimal symbol specified in config.js.
- 
+- Module header now updates correctly, if a module need to dynamically show/hide its header based on a condition.
+
 ## [2.9.0] - 2019-10-01
 
 ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`. If you are having issues running Electron, make sure your [Raspbian is up to date](https://www.raspberrypi.org/documentation/raspbian/updating.md).

js/main.js

@@ -39,11 +39,13 @@ var MM = (function() {
 			dom.opacity = 0;
 			wrapper.appendChild(dom);
 
-			if (typeof module.getHeader() !== "undefined" && module.getHeader() !== "") {
+			var moduleHeader = document.createElement("header");
-				var moduleHeader = document.createElement("header");
+			moduleHeader.innerHTML = module.getHeader();
-				moduleHeader.innerHTML = module.getHeader();
+			moduleHeader.className = "module-header";
-				moduleHeader.className = "module-header";
+			dom.appendChild(moduleHeader);
-				dom.appendChild(moduleHeader);
+
+			if (typeof module.getHeader() === "undefined" || module.getHeader() !== "") {
+				moduleHeader.style = "display: none;";
 			}
 
 			var moduleContent = document.createElement("div");
@@ -210,9 +212,8 @@ var MM = (function() {
 		contentWrapper[0].innerHTML = "";
 		contentWrapper[0].appendChild(newContent);
 
-		if( headerWrapper.length > 0 && newHeader) {
+		headerWrapper[0].innerHTML = newHeader;
-			headerWrapper[0].innerHTML = newHeader;
+		headerWrapper[0].style = headerWrapper.length > 0 && newHeader ? undefined : "display: none;";
-		}
 	};
 
 	/* hideModule(module, speed, callback)

js/server.js

@@ -24,7 +24,7 @@ var Server = function(config, callback) {
 
 	console.log("Starting server on port " + port + " ... ");
 
-	server.listen(port, config.address ? config.address : null);
+	server.listen(port, config.address ? config.address : "localhost");
 
 	if (config.ipWhitelist instanceof Array && config.ipWhitelist.length === 0) {
 		console.info(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs"));

modules/default/calendar/calendar.js

@@ -180,6 +180,7 @@ Module.register("calendar", {
 
 					dateCell.colSpan = "3";
 					dateCell.innerHTML = dateAsString;
+					dateCell.style.paddingTop = "10px";
 					dateRow.appendChild(dateCell);
 					wrapper.appendChild(dateRow);
 

package.json

@@ -34,8 +34,8 @@
   },
   "homepage": "https://magicmirror.builders",
   "devDependencies": {
-    "chai": "^4.1.2",
+    "chai": "latest",
-    "chai-as-promised": "^7.1.1",
+    "chai-as-promised": "latest",
     "current-week-number": "^1.0.7",
     "danger": "^3.1.3",
     "grunt": "latest",
@@ -47,16 +47,16 @@
     "http-auth": "^3.2.3",
     "jsdom": "^11.6.2",
     "jshint": "^2.10.2",
-    "mocha": "^4.1.0",
+    "mocha": "latest",
-    "mocha-each": "^1.1.0",
+    "mocha-each": "latest",
-    "mocha-logger": "^1.0.6",
+    "mocha-logger": "latest",
-    "spectron": "^3.8.0",
+    "spectron": "^8.0.0",
     "stylelint": "latest",
     "stylelint-config-standard": "latest",
     "time-grunt": "latest"
   },
   "optionalDependencies": {
-    "electron": "^3.0.13"
+    "electron": "^6.0.12"
   },
   "dependencies": {
     "colors": "^1.1.2",

run-start.sh

@@ -8,6 +8,7 @@ fi
 # get the processor architecture
 arch=$(uname -m)
 false='false'
+
 # get the config option, if any
 # only check non comment lines
 serveronly=$(grep -v '^\s//'  config/config.js | grep -i serveronly: | awk '{print tolower($2)}' | tr -d ,\"\')
@@ -23,7 +24,7 @@ mac=$(uname)
 #    system is in text mode
 #
 if [ "$serveronly." != "false." -o  "$arch" == "armv6l" ] ||  [ "$xorg." == "." -a $mac != 'Darwin' ]; then
-	
+
 	# if user explicitly configured to run server only (no ui local)
 	# OR there is no xwindows running, so no support for browser graphics
 	if [ "$serveronly." == "true." -o "$xorg." == "." ]; then

tests/e2e/vendor_spec.js

@@ -35,7 +35,10 @@ describe("Vendors", function () {
 			it(`should return 200 HTTP code for vendor "${vendor}"`, function () {
 				urlVendor = "http://localhost:8080/vendor/" + vendors[vendor];
 				request.get(urlVendor, function (err, res, body) {
-					expect(res.statusCode).to.equal(200);
+					if (!err)
+						expect(res.statusCode).to.equal(200);
+					else
+						mlog.pending(`There error vendor 200 test ${err}`);						
 				});
 			});
 		});