fix(google-auth): popup.

2 files changed, 10 insertions, 2 deletions

diff --git a/app/features/conference/components/Conference.js b/app/features/conference/components/Conference.js
index 5075a53..8683820 100644
--- a/app/features/conference/components/Conference.js
+++ b/app/features/conference/components/Conference.js
@@ -9,6 +9,7 @@ import {
     RemoteControl,
     setupScreenSharingForWindow,
     setupAlwaysOnTopRender,
+    initPopupsConfigurationRender,
     setupWiFiStats
 } from 'jitsi-meet-electron-utils';
 
@@ -120,6 +121,8 @@ class Conference extends Component<Props, *> {
             parentNode,
             roomName
         });
+        initPopupsConfigurationRender(this._api);
+
         const iframe = this._api.getIFrame();
 
         setupScreenSharingForWindow(iframe);
diff --git a/main.js b/main.js
index 4463c0f..25c7000 100644
--- a/main.js
+++ b/main.js
@@ -7,7 +7,9 @@ const BrowserWindow = electron.BrowserWindow;
 const isDev = require('electron-is-dev');
 
 const {
-    setupAlwaysOnTopMain
+    setupAlwaysOnTopMain,
+    initPopupsConfigurationMain,
+    getPopupTarget
 } = require('jitsi-meet-electron-utils');
 
 const path = require('path');
@@ -84,9 +86,12 @@ function setAPPListeners() {
 function createJitsiMeetWindow() {
     jitsiMeetWindow = new BrowserWindow(jitsiMeetWindowOptions);
     jitsiMeetWindow.loadURL(indexURL);
+    initPopupsConfigurationMain(jitsiMeetWindow);
 
     jitsiMeetWindow.webContents.on('new-window', (event, url, frameName) => {
-        if (frameName !== 'AlwaysOnTop') {
+        const target = getPopupTarget(url, frameName);
+
+        if (!target || target === 'browser') {
             event.preventDefault();
             electron.shell.openExternal(url);
         }