diff options
| author | Avram Tudor <tudor.potecaru@gmail.com> | 2022-08-24 11:39:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 11:39:04 +0300 |
| commit | 4fe51c23c2e65467e741034375eec0df9f3423d0 (patch) | |
| tree | 67cbcaae1108955c7450ad2805d788f8e6ac4cd1 | |
| parent | 5b9119c62b011de090171134a56253ab748e8064 (diff) | |
| parent | 542c7f089a241487a0c7bc7905e21db93c5bb13b (diff) | |
Merge pull request #787 from jitsi/tavram/update-electron-sdk
chore: update jitsi-electron-sdk to 3.0.18
| -rw-r--r-- | main.js | 22 | ||||
| -rw-r--r-- | package-lock.json | 14 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 21 insertions, 17 deletions
@@ -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; }); diff --git a/package-lock.json b/package-lock.json index 7508884..ae9fbbf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index c5ef677..700c56a 100644 --- a/package.json +++ b/package.json @@ -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" }, |