Merge branch 'develop' into fixdefmod

CHANGELOG.md

@@ -4,11 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [2.1.1] - Unreleased
 
+### Changed
+- Installer: Use init config.js from config.js.sample.
+
 ### Added
 - Add loaded function to modules, providing an async callback.
 
 ### Fixed
-- Update .gitignore to not ignore default modules folder
+- Update .gitignore to not ignore default modules folder.
+- Remove white flash on boot up.
+
 
 ## [2.1.0] - 2016-12-31
 

LICENSE.md

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 =====================
 
-Copyright © 2016 Michael Teeuw
+Copyright © 2016-2017 Michael Teeuw
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

installers/raspberry.sh

@@ -113,6 +113,9 @@ else
 	exit;
 fi
 
+# Use sample config for start MagicMirror
+cp config/config.js.sample config/config.js
+
 # Check if plymouth is installed (default with PIXEL desktop environment), then install custom splashscreen.
 echo -e "\e[96mCheck plymouth installation ...\e[0m"
 if command_exists plymouth; then

js/electron.js

@@ -28,7 +28,8 @@ function createWindow() {
 		webPreferences: {
 			nodeIntegration: false,
 			zoomFactor: config.zoom
-		}
+		},
+		backgroundColor: "#000000"
 	}
 
 	// DEPRECATED: "kioskmode" backwards compatibility, to be removed