aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDevine Lu Linvega <[email protected]>2019-04-25 07:02:20 +0900
committerDevine Lu Linvega <[email protected]>2019-04-25 07:02:20 +0900
commit1bae16c87dd44594ff39360f31b34419e9e0ee7f (patch)
tree91bc94f227e312645fc915cc38246242fd8be11a
parentde560479839220e881b84086bafafee06f677750 (diff)
downloadOrca-1bae16c87dd44594ff39360f31b34419e9e0ee7f.tar.gz
Orca-1bae16c87dd44594ff39360f31b34419e9e0ee7f.zip
Updated to Electron 5
-rw-r--r--desktop/core/io/osc.js2
-rw-r--r--desktop/main.js3
-rw-r--r--desktop/package-lock.json20
-rw-r--r--desktop/package.json4
4 files changed, 14 insertions, 15 deletions
diff --git a/desktop/core/io/osc.js b/desktop/core/io/osc.js
index c761ced..ca2d157 100644
--- a/desktop/core/io/osc.js
+++ b/desktop/core/io/osc.js
@@ -54,7 +54,7 @@ function Osc (terminal) {
}
this.setup = function (ip = '127.0.0.1') {
- if (this.client) { this.client.kill() }
+ if (this.client) { this.client.close() }
this.client = new osc.Client(ip, this.port)
}
}
diff --git a/desktop/main.js b/desktop/main.js
index 0eb0545..157729c 100644
--- a/desktop/main.js
+++ b/desktop/main.js
@@ -19,8 +19,7 @@ app.on('ready', () => {
frame: process.platform !== 'darwin',
skipTaskbar: process.platform === 'darwin',
autoHideMenuBar: process.platform === 'darwin',
- webPreferences: { zoomFactor: 1.0 },
- webPreferences: { backgroundThrottling: false }
+ webPreferences: { zoomFactor: 1.0, nodeIntegration: true, backgroundThrottling: false }
})
app.win.loadURL(`file://${__dirname}/sources/index.html`)
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index fef4748..33dfaa8 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@types/node": {
- "version": "8.10.46",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.46.tgz",
- "integrity": "sha512-PfnRbk836fFs9T9QnZh0G1k9oC6YXCqIK3LX6vU/6oiXtEBSFCiJFj6UnLZtqIIHTsgMn8Dojq3yhmpwY7QWcw==",
+ "version": "10.14.5",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.5.tgz",
+ "integrity": "sha512-Ja7d4s0qyGFxjGeDq5S7Si25OFibSAHUi6i17UWnwNnpitADN7hah9q0Tl25gxuV5R1u2Bx+np6w4LHXfHyj/g==",
"dev": true
},
"ajv": {
@@ -340,12 +340,12 @@
}
},
"electron": {
- "version": "3.1.8",
- "resolved": "https://registry.npmjs.org/electron/-/electron-3.1.8.tgz",
- "integrity": "sha512-1MiFoMzxGaR0wDfwFE5Ydnuk6ry/4lKgF0c+NFyEItxM/WyEHNZPNjJAeKJ+M/0sevmZ+6W4syNZnQL5M3GgsQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.0.tgz",
+ "integrity": "sha512-++emIe4vLihiYiAVL+E8DT5vSNVFEIuQCRxA+VfpDRVBcog85UB28vi4ogRmMOK3UffzKdWV6e1jqp3T0KpBoA==",
"dev": true,
"requires": {
- "@types/node": "^8.0.24",
+ "@types/node": "^10.12.18",
"electron-download": "^4.1.0",
"extract-zip": "^1.0.3"
}
@@ -1045,9 +1045,9 @@
"dev": true
},
"node-osc": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/node-osc/-/node-osc-3.0.1.tgz",
- "integrity": "sha512-krU2NdA5FZhMpS/eMKmGVyFm51Sy0dWie1TLQlpqvDJAxuQ1xzyWuZihlBEnpi6NVQHnd2msrzLFgRCuZzLa/g==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/node-osc/-/node-osc-4.1.0.tgz",
+ "integrity": "sha512-VXMbmLMFxLt2rbUWxCLcq5nEcSXf6Zxyepzh6Vh6zDeIO/xBNqH5X1R6DuoITi4WOs1ae6VKu3ZwQJDN5D+Cdg==",
"requires": {
"jspack": "0.0.4",
"osc-min": "^1.1.1"
diff --git a/desktop/package.json b/desktop/package.json
index 1da79ab..f00bbd6 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -19,10 +19,10 @@
"push": "npm run build ; npm run push_osx ; npm run push_linux ; npm run push_win ; npm run clean ; npm run push_status"
},
"devDependencies": {
- "electron": "^3.1.8",
+ "electron": "^5.0.0",
"electron-packager": "^13.1.1"
},
"dependencies": {
- "node-osc": "^3.0.1"
+ "node-osc": "^4.1.0"
}
}