lixuechuan
/
first-electron
mirror of https://gitee.com/lixuechuan/first-electron.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #209 from electron/update-main 

feat: update index loading for new API
This commit is contained in:
Zeke Sikelianos 2018-05-25 14:43:26 -07:00 committed by GitHub
parent f9cd0707f8 ec3eacbf94
commit dc1585b235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.js
View File

@ -1,11 +1,5 @@
const electron = require('electron') // Modules to control application life and create native browser window
// Module to control application life. const {app, BrowserWindow} = require('electron')
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 // 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. // be closed automatically when the JavaScript object is garbage collected.
@ -16,11 +10,7 @@ function createWindow () {
mainWindow = new BrowserWindow({width: 800, height: 600}) mainWindow = new BrowserWindow({width: 800, height: 600})
// and load the index.html of the app. // and load the index.html of the app.
mainWindow.loadURL(url.format({ mainWindow.loadFile('index.html')
pathname: path.join(__dirname, 'index.html'),
protocol: 'file:',
slashes: true
}))
// Open the DevTools. // Open the DevTools.
// mainWindow.webContents.openDevTools() // mainWindow.webContents.openDevTools()