NB-Public/jitsi-meet-electron
13
0
Fork 0
mirror of https://github.com/netzbegruenung/jitsi-meet-electron.git synced 2024-05-05 18:23:41 +02:00
Code Issues Projects Releases Wiki Activity

fix: Electron 5 support.

Browse source
This commit is contained in:
Hristo Terezov 2019-10-02 08:20:43 +01:00
parent 930797f7d6
commit 061fbf9f88
3 changed files with 3003 additions and 1840 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main.js
View file

@ -18,6 +18,9 @@ const {
const path = require('path'); const path = require('path');
const URL = require('url'); const URL = require('url');
// We need this because of https://github.com/electron/electron/issues/18214
app.commandLine.appendSwitch('disable-site-isolation-trials');
autoUpdater.logger = require('electron-log'); autoUpdater.logger = require('electron-log');
autoUpdater.logger.transports.file.level = 'info'; autoUpdater.logger.transports.file.level = 'info';
@ -134,7 +137,8 @@ function createJitsiMeetWindow() {
minHeight: 600, minHeight: 600,
show: false, show: false,
webPreferences: { webPreferences: {
nativeWindowOpen: true nativeWindowOpen: true,
nodeIntegration: true
} }
}; };

4831
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

6
package.json
View file

@ -91,12 +91,12 @@
"electron-debug": "2.0.0", "electron-debug": "2.0.0",
"electron-is-dev": "1.0.1", "electron-is-dev": "1.0.1",
"electron-log": "2.2.17", "electron-log": "2.2.17",
"electron-reload": "1.4.0", "electron-reload": "1.5.0",
"electron-store": "2.0.0", "electron-store": "2.0.0",
"electron-updater": "4.0.6", "electron-updater": "4.0.6",
"electron-window-state": "5.0.3", "electron-window-state": "5.0.3",
"history": "4.7.2", "history": "4.7.2",
"jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v0.6.7", "jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v0.6.9",
"js-utils": "github:jitsi/js-utils#0c53500a5120be2aa3fc590f0f932a0d4771920f", "js-utils": "github:jitsi/js-utils#0c53500a5120be2aa3fc590f0f932a0d4771920f",
"moment": "2.23.0", "moment": "2.23.0",
"mousetrap": "1.6.2", "mousetrap": "1.6.2",
@ -125,7 +125,7 @@
"concurrently": "4.1.0", "concurrently": "4.1.0",
"css-loader": "2.0.1", "css-loader": "2.0.1",
"devtron": "1.4.0", "devtron": "1.4.0",
"electron": "4.1.5", "electron": "5.0.11",
"electron-builder": "20.38.3", "electron-builder": "20.38.3",
"electron-react-devtools": "0.5.3", "electron-react-devtools": "0.5.3",
"eslint": "5.10.0", "eslint": "5.10.0",