From df4bf423f05865931736eff71caec1f8a71e49f6 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Sun, 26 May 2019 19:59:27 +0900 Subject: [PATCH] Updated Electron --- desktop/.eslintrc.json | 10 ---------- desktop/main.js | 7 +++---- desktop/package.json | 16 ++-------------- 3 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 desktop/.eslintrc.json diff --git a/desktop/.eslintrc.json b/desktop/.eslintrc.json deleted file mode 100644 index 1e72195..0000000 --- a/desktop/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "standard", - "env": { - "browser": true, - "node": true - }, - "globals": { - "dotgrid": true - } -} diff --git a/desktop/main.js b/desktop/main.js index efaa1fa..4f69988 100644 --- a/desktop/main.js +++ b/desktop/main.js @@ -14,13 +14,12 @@ app.on('ready', () => { minWidth: 320, minHeight: 320, backgroundColor: '#000', + icon: path.join(__dirname, { darwin: 'icon.icns', linux: 'icon.png', win32: 'icon.ico' }[process.platform] || 'icon.ico'), resizable: true, - icon: __dirname + '/icon.ico', - resizable: true, - webPreferences: { zoomFactor: 1.0 }, frame: process.platform !== 'darwin', skipTaskbar: process.platform === 'darwin', - autoHideMenuBar: process.platform === 'darwin' + autoHideMenuBar: process.platform === 'darwin', + webPreferences: { zoomFactor: 1.0, nodeIntegration: true, backgroundThrottling: false } }) app.win.loadURL(`file://${__dirname}/sources/index.html`) diff --git a/desktop/package.json b/desktop/package.json index 3979269..af9ecad 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -20,19 +20,7 @@ "push": "npm run build ; npm run push_theme ; npm run push_osx ; npm run push_linux ; npm run push_win ; npm run clean ; npm run push_status" }, "devDependencies": { - "electron": "^3.1.4", - "electron-packager": "^13.0.1", - "eslint": "^5.14.0", - "eslint-config-standard": "^12.0.0", - "eslint-plugin-import": "^2.16.0", - "eslint-plugin-node": "^7.0.1", - "eslint-plugin-promise": "^4.0.1", - "eslint-plugin-standard": "^4.0.0" - }, - "dependencies": {}, - "standard": { - "globals": [ - "dotgrid" - ] + "electron": "^5.0.1", + "electron-packager": "^13.1.1" } }