From 542c7f089a241487a0c7bc7905e21db93c5bb13b Mon Sep 17 00:00:00 2001
From: Avram Tudor <tudor.potecaru@8x8.com>
Date: Wed, 24 Aug 2022 11:22:27 +0300
Subject: [PATCH] chore: update jitsi-electron-sdk to 3.0.18

---
 main.js           | 22 +++++++++++++---------
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/main.js b/main.js
index ee35221..522a720 100644
--- a/main.js
+++ b/main.js
@@ -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"
   },