kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Standardize: TO JSCS!

Browse Source
This commit is contained in:
Nicholas Hubbard
2016-04-05 14:35:11 -04:00
parent 18390503b5
commit 426728058c
28 changed files with 623 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
js/electron.js
View File

@@ -1,13 +1,13 @@
'use strict';
"use strict";
//load modules
const walk = require('walk');
const fs = require('fs');
const Server = require(__dirname + '/server.js');
const spawn = require('child_process').spawn;
const electron = require('electron');
const defaultModules = require(__dirname + '/../modules/default/defaultmodules.js');
const path = require('path');
const walk = require("walk");
const fs = require("fs");
const Server = require(__dirname + "/server.js");
const spawn = require("child_process").spawn;
const electron = require("electron");
const defaultModules = require(__dirname + "/../modules/default/defaultmodules.js");
const path = require("path");
// Config
var config = {};
@@ -22,19 +22,19 @@ var nodeHelpers = [];
// be closed automatically when the JavaScript object is garbage collected.
let mainWindow;
function createWindow () {
function createWindow() {
// Create the browser window.
mainWindow = new BrowserWindow({width: 800, height: 600, fullscreen: true, autoHideMenuBar: true, webPreferences: {nodeIntegration: false}});
// and load the index.html of the app.
//mainWindow.loadURL('file://' + __dirname + '../../index.html');
mainWindow.loadURL('http://localhost:' + config.port);
mainWindow.loadURL("http://localhost:" + config.port);
// Open the DevTools.
//mainWindow.webContents.openDevTools();
// Emitted when the window is closed.
mainWindow.on('closed', function() {
mainWindow.on("closed", function() {
// Dereference the window object, usually you would store windows
// in an array if your app supports multi windows, this is the time
// when you should delete the corresponding element.
@@ -42,36 +42,36 @@ function createWindow () {
});
}
function loadConfig (callback) {
function loadConfig(callback) {
console.log("Loading config ...");
var defaults = require(__dirname + '/defaults.js');
var configFilename = __dirname + '/../config/config.js';
var defaults = require(__dirname + "/defaults.js");
var configFilename = __dirname + "/../config/config.js";
try {
fs.accessSync(configFilename, fs.R_OK);
var c = require(configFilename);
fs.accessSync(configFilename, fs.R_OK);
var c = require(configFilename);
var config = Object.assign(defaults, c);
callback(config);
} catch (e) {
callback(defaults);
callback(defaults);
}
}
function loadModule(module) {
var elements = module.split('/');
var elements = module.split("/");
var moduleName = elements[elements.length - 1];
var moduleFolder = __dirname + '/../modules/' + module;
var moduleFolder = __dirname + "/../modules/" + module;
if (defaultModules.indexOf(moduleName) !== -1) {
moduleFolder = __dirname + '/../modules/default/' + module;
moduleFolder = __dirname + "/../modules/default/" + module;
}
var helperPath = moduleFolder + '/node_helper.js';
var helperPath = moduleFolder + "/node_helper.js";
var loadModule = true;
try {
fs.accessSync(helperPath, fs.R_OK);
fs.accessSync(helperPath, fs.R_OK);
} catch (e) {
loadModule = false;
console.log("No helper found for module: " + moduleName + ".");
@@ -80,9 +80,9 @@ function loadModule(module) {
if (loadModule) {
var Module = require(helperPath);
var m = new Module();
m.setName(moduleName);
m.setPath(path.resolve(moduleFolder));
nodeHelpers.push(m);
m.setName(moduleName);
m.setPath(path.resolve(moduleFolder));
nodeHelpers.push(m);
}
}
@@ -111,7 +111,7 @@ loadConfig(function(c) {
loadModules(modules);
var server = new Server(config, function(app, io) {
console.log('Server started ...');
console.log("Server started ...");
for (var h in nodeHelpers) {
var nodeHelper = nodeHelpers[h];
@@ -120,28 +120,28 @@ loadConfig(function(c) {
nodeHelper.start();
}
console.log('Sockets connected & modules started ...');
console.log("Sockets connected & modules started ...");
});
});
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
app.on('ready', function() {
console.log('Launching application.');
app.on("ready", function() {
console.log("Launching application.");
createWindow();
});
// Quit when all windows are closed.
app.on('window-all-closed', function () {
app.on("window-all-closed", function() {
// On OS X it is common for applications and their menu bar
// to stay active until the user quits explicitly with Cmd + Q
if (process.platform !== 'darwin') {
if (process.platform !== "darwin") {
app.quit();
}
});
app.on('activate', function () {
app.on("activate", function() {
// On OS X it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
if (mainWindow === null) {