From 6552157894e6047b72dbbdf7339bedd96dea96fe Mon Sep 17 00:00:00 2001
From: Rodrigo Ramez Norambuena
Date: Wed, 4 Jan 2017 12:52:21 -0300
Subject: [PATCH 1/3] Remove white flash on boot up
When the electron app is started appear a white flash before show the
MagicMirror system.
This patch remove the white flash on boot up.
---
CHANGELOG.md | 3 +++
js/electron.js | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6408d1d2..cefc49c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added
- Add loaded function to modules, providing an async callback.
+### Fixed
+- Remove white flash on boot up
+
## [2.1.0] - 2016-12-31
**Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
diff --git a/js/electron.js b/js/electron.js
index 173abe68..1f16092b 100644
--- a/js/electron.js
+++ b/js/electron.js
@@ -28,7 +28,8 @@ function createWindow() {
webPreferences: {
nodeIntegration: false,
zoomFactor: config.zoom
- }
+ },
+ backgroundColor: "#000000"
}
// DEPRECATED: "kioskmode" backwards compatibility, to be removed
From 396bbd83c8bbee6d92a892cfdb7c5e958427b8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?=
Date: Sun, 1 Jan 2017 19:51:50 -0300
Subject: [PATCH 2/3] modified installer to use config.js.sample for init
config.
---
CHANGELOG.md | 3 +++
installers/raspberry.sh | 3 +++
2 files changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6408d1d2..852df9c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ 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.
diff --git a/installers/raspberry.sh b/installers/raspberry.sh
index cd995a1e..b970d02e 100644
--- a/installers/raspberry.sh
+++ b/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
From 831d8b6d362af7672a0e7f573ee75b11555025ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?=
Date: Tue, 10 Jan 2017 15:21:59 -0300
Subject: [PATCH 3/3] update year license for 2017
---
LICENSE.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/LICENSE.md b/LICENSE.md
index d4765af2..09ac7e6f 100644
--- a/LICENSE.md
+++ b/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