From 2cf7ea0a944b3ce565053a452690f9d67aa5297f Mon Sep 17 00:00:00 2001 From: lilia Date: Thu, 2 Mar 2017 14:04:38 -0800 Subject: [PATCH] Hello Electron In package.json, define our main entry point for electron, and add a node script to start it up. Add main.js from Electron/electron-quick-start with two modifications. 1. Load background.html instead of index.html 2. Disable node integration in the renderer At this point we can load the background page in a window with `npm start`, though it currently breaks on missing chrome app APIs. // FREEBIE --- main.js | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 4 +++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 main.js diff --git a/main.js b/main.js new file mode 100644 index 000000000..6f84a0102 --- /dev/null +++ b/main.js @@ -0,0 +1,60 @@ +const electron = require('electron') +// Module to control application life. +const app = electron.app +// Module to create native browser window. +const BrowserWindow = electron.BrowserWindow + +const path = require('path') +const url = require('url') + +// Keep a global reference of the window object, if you don't, the window will +// be closed automatically when the JavaScript object is garbage collected. +let mainWindow + +function createWindow () { + // Create the browser window. + mainWindow = new BrowserWindow({width: 800, height: 600, webPreferences: {nodeIntegration: false}}) + + // and load the index.html of the app. + mainWindow.loadURL(url.format({ + pathname: path.join(__dirname, 'background.html'), + protocol: 'file:', + slashes: true + })) + + // Open the DevTools. + mainWindow.webContents.openDevTools() + + // Emitted when the window is closed. + 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. + mainWindow = null + }) +} + +// This method will be called when Electron has finished +// initialization and is ready to create browser windows. +// Some APIs can only be used after this event occurs. +app.on('ready', createWindow) + +// Quit when all windows are closed. +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') { + app.quit() + } +}) + +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) { + createWindow() + } +}) + +// In this file you can include the rest of your app's specific main process +// code. You can also put them in separate files and require them here. diff --git a/package.json b/package.json index fe9040e95..4ff908398 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "signal-desktop", "repository": "https://github.com/WhisperSystems/Signal-Desktop.git", "version": "0.0.0", + "main": "main.js", "devDependencies": { "bower": "^1.3.12", "grunt": "^0.4.5", @@ -20,6 +21,7 @@ }, "scripts": { "test": "grunt test", - "lint": "grunt jshint" + "lint": "grunt jshint", + "start": "electron ." } }