Merge pull request #787 from jitsi/tavram/update-electron-sdk

chore: update jitsi-electron-sdk to 3.0.18
This commit is contained in:
Avram Tudor 2022-08-24 11:39:04 +03:00 committed by GitHub
commit 4fe51c23c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 17 deletions

22
main.js
View file

@ -211,26 +211,30 @@ function createJitsiMeetWindow() {
}
};
const windowOpenHandler = ({ url, frameName }) => {
const target = getPopupTarget(url, frameName);
if (!target || target === 'browser') {
openExternalLink(url);
}
return { action: 'deny' };
};
mainWindow = new BrowserWindow(options);
windowState.manage(mainWindow);
mainWindow.loadURL(indexURL);
mainWindow.webContents.setWindowOpenHandler(windowOpenHandler);
initPopupsConfigurationMain(mainWindow);
setupAlwaysOnTopMain(mainWindow);
setupAlwaysOnTopMain(mainWindow, null, windowOpenHandler);
setupPowerMonitorMain(mainWindow);
setupScreenSharingMain(mainWindow, config.default.appName, pkgJson.build.appId);
if (ENABLE_REMOTE_CONTROL) {
new RemoteControlMain(mainWindow); // eslint-disable-line no-new
}
mainWindow.webContents.on('new-window', (event, url, frameName) => {
const target = getPopupTarget(url, frameName);
if (!target || target === 'browser') {
event.preventDefault();
openExternalLink(url);
}
});
mainWindow.on('closed', () => {
mainWindow = null;
});

14
package-lock.json generated
View file

@ -10,7 +10,7 @@
"hasInstallScript": true,
"license": "Apache-2.0",
"dependencies": {
"@jitsi/electron-sdk": "^3.0.15",
"@jitsi/electron-sdk": "3.0.18",
"electron-debug": "^3.2.0",
"electron-reload": "^1.5.0"
},
@ -3057,9 +3057,9 @@
"dev": true
},
"node_modules/@jitsi/electron-sdk": {
"version": "3.0.15",
"resolved": "https://registry.npmjs.org/@jitsi/electron-sdk/-/electron-sdk-3.0.15.tgz",
"integrity": "sha512-oElArTC7GD53jlq3+Y+2JSVez/e3QMWjrnqIKz7WH0oy6sfkff2zKqgEQRROz0bApJZGkOt5QKdZibc+ESCqkA==",
"version": "3.0.18",
"resolved": "https://registry.npmjs.org/@jitsi/electron-sdk/-/electron-sdk-3.0.18.tgz",
"integrity": "sha512-7i0bVyoISlRUuX3eSz/AvxeAul5OXZmot4OXWHtqaR8svZ/ND5QZ1qAtZNKumS3ADtd1MH6hrA4KAl0DxRqNfg==",
"hasInstallScript": true,
"dependencies": {
"@jitsi/logger": "^2.0.0",
@ -17209,9 +17209,9 @@
"dev": true
},
"@jitsi/electron-sdk": {
"version": "3.0.15",
"resolved": "https://registry.npmjs.org/@jitsi/electron-sdk/-/electron-sdk-3.0.15.tgz",
"integrity": "sha512-oElArTC7GD53jlq3+Y+2JSVez/e3QMWjrnqIKz7WH0oy6sfkff2zKqgEQRROz0bApJZGkOt5QKdZibc+ESCqkA==",
"version": "3.0.18",
"resolved": "https://registry.npmjs.org/@jitsi/electron-sdk/-/electron-sdk-3.0.18.tgz",
"integrity": "sha512-7i0bVyoISlRUuX3eSz/AvxeAul5OXZmot4OXWHtqaR8svZ/ND5QZ1qAtZNKumS3ADtd1MH6hrA4KAl0DxRqNfg==",
"requires": {
"@jitsi/logger": "^2.0.0",
"@jitsi/robotjs": "^0.6.9",

View file

@ -130,7 +130,7 @@
"readmeFilename": "README.md",
"license": "Apache-2.0",
"dependencies": {
"@jitsi/electron-sdk": "^3.0.15",
"@jitsi/electron-sdk": "3.0.18",
"electron-debug": "^3.2.0",
"electron-reload": "^1.5.0"
},