Skip to content

Commit

Permalink
upgrade to electron 5
Browse files Browse the repository at this point in the history
  • Loading branch information
PalmerAL committed Mar 7, 2019
1 parent 5cdaa5d commit e771392
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions main/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ function createWindowWithBounds (bounds, shouldMaximize) {
icon: __dirname + '/icons/icon256.png',
frame: process.platform !== 'win32',
backgroundColor: '#fff', // the value of this is ignored, but setting it seems to work around https://github.com/electron/electron/issues/10559
webPreferences: {
nodeIntegration: true
}
})

// and load the index.html of the app.
Expand Down
6 changes: 3 additions & 3 deletions main/viewManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ function createView (id, webPreferencesString, boundsString, events) {
})
})

view.webContents.on('ipc-message', function (e, data) {
view.webContents.on('ipc-message', function (e, channel, data) {
mainWindow.webContents.send('view-ipc', {
id: id,
name: data[0],
data: data[1]
name: channel,
data: data
})
})

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "min",
"productName": "Min",
"version": "1.9.1",
"electronVersion": "4.0.5",
"electronVersion": "5.0.0-beta.5",
"main": "main.build.js",
"dependencies": {
"dexie": "^1.2.0",
Expand Down

0 comments on commit e771392

Please sign in to comment.