Skip to content

Commit

Permalink
Fix indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
maximegris committed May 5, 2017
1 parent f18ac77 commit 6a9836a
Showing 1 changed file with 40 additions and 37 deletions.
77 changes: 40 additions & 37 deletions main.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use strict';

const electron = require('electron');
// Module to control application life.
const {app} = electron;
const { app } = electron;
// Module to create native browser window.
const {BrowserWindow} = electron;
const { BrowserWindow } = electron;

let win, serve;
const args = process.argv.slice(1);
Expand All @@ -15,56 +16,58 @@ if (serve) {

function createWindow() {

let electronScreen = electron.screen;
let size = electronScreen.getPrimaryDisplay().workAreaSize;
let electronScreen = electron.screen;
let size = electronScreen.getPrimaryDisplay().workAreaSize;

// Create the browser window.
win = new BrowserWindow({
x: 0,
y: 0,
width: size.width,
height: size.height
});
// Create the browser window.
win = new BrowserWindow({
x: 0,
y: 0,
width: size.width,
height: size.height
});

let url = serve ?
'file://' + __dirname + '/dist/index.html':
'file://' + __dirname + '/index.html';
let url = serve ?
'file://' + __dirname + '/dist/index.html' :
'file://' + __dirname + '/index.html';

// and load the index.html of the app.
win.loadURL(url);
// and load the index.html of the app.
win.loadURL(url);

// Open the DevTools.
if (serve) {
win.webContents.openDevTools();
}
// Open the DevTools.
if (serve) {
win.webContents.openDevTools();
}

// Emitted when the window is closed.
win.on('closed', () => {
// 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.
win = null;
});
// Emitted when the window is closed.
win.on('closed', () => {
// Dereference the window object, usually you would store window
// in an array if your app supports multi windows, this is the time
// when you should delete the corresponding element.
win = 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', () => {
// 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();
}
// 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', () => {
// 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 (win === null) {
createWindow();
}
// 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 (win === null) {
createWindow();
}
});

0 comments on commit 6a9836a

Please sign in to comment.