kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'colors-error' into check-wrong-configuration

Browse Source
This commit is contained in:
Rodrigo Ramírez Norambuena 2017-03-18 06:00:49 -03:00
commit 2c0ca78265
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/app.js
View File

@ -68,11 +68,11 @@ var App = function() {
callback(config); callback(config);
} catch (e) { } catch (e) {
if (e.code == "ENOENT") { if (e.code == "ENOENT") {
console.error("WARNING! Could not find config file. Please create one. Starting with default configuration."); console.error(Utils.colors.error("WARNING! Could not find config file. Please create one. Starting with default configuration."));
} else if (e instanceof ReferenceError || e instanceof SyntaxError) { } else if (e instanceof ReferenceError || e instanceof SyntaxError) {
console.error("WARNING! Could not validate config file. Please correct syntax errors. Starting with default configuration."); console.error(Utils.colors.error("WARNING! Could not validate config file. Please correct syntax errors. Starting with default configuration."));
} else { } else {
console.error("WARNING! Could not load config file. Starting with default configuration. Error found: " + e); console.error(Utils.colors.error("WARNING! Could not load config file. Starting with default configuration. Error found: " + e));
} }
callback(defaults); callback(defaults);
} }

3
js/utils.js
View File

@ -10,7 +10,8 @@ var colors = require("colors/safe");
var Utils = { var Utils = {
colors: { colors: {
warn: colors.yellow warn: colors.yellow,
error: colors.red
} }
}; };