Merge branch 'develop' into fix_helper

.travis.yml

@@ -6,6 +6,7 @@ node_js:
 before_install:
   - npm i -g npm
 
+
 before_script:
  - yarn danger ci
  - npm install grunt-cli -g

CHANGELOG.md

@@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added 
 - move node_helper module to dedicated github repo, to prevent being erased accidentally
+
+- new upgrade script to help users consume regular updates installers/upgrade-script.sh
+- new script to help setup pm2, without install installers/fixuppm2.sh
+
+### Updated
+- 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
+- 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.
@@ -15,11 +23,13 @@ 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
 

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");
 			moduleHeader.innerHTML = module.getHeader();
 			moduleHeader.className = "module-header";
 			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].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-as-promised": "^7.1.1",
+    "chai": "latest",
+    "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-each": "^1.1.0",
-    "mocha-logger": "^1.0.6",
-    "spectron": "^3.8.0",
+    "mocha": "latest",
+    "mocha-each": "latest",
+    "mocha-logger": "latest",
+    "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

@@ -7,10 +7,12 @@ if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
 fi
 # get the processor architecture
 arch=$(uname -m)
-# got the config option, if any
-serveronly=$(grep -i serveronly: config/config.js | awk '{print tolower($2)}' | tr -d ,\"\')
+
+# 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 ,\"\')
 # set default if not defined in config
-serveronly="${serveronly:=false}"
+serveronly=${serveronly:-false}
 # check for xwindows running
 xorg=$(pgrep Xorg)
 #check for macOS
@@ -60,5 +62,5 @@ if [ "$serveronly." != "false." -o  "$arch" == "armv6l" ] ||  [ "$xorg." == "."
 	fi 
 else  
 	# we can use electron directly	
-	`electron js/electron.js $1`;
+	electron js/electron.js $1;
 fi

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) {
+					if (!err)
 						expect(res.statusCode).to.equal(200);
+					else
+						mlog.pending(`There error vendor 200 test ${err}`);						
 				});
 			});
 		});