NB-Public/jitsi-meet-electron
13
0
Fork 0
mirror of https://github.com/netzbegruenung/jitsi-meet-electron.git synced 2024-04-26 06:10:07 +02:00
Code Issues Projects Releases Wiki Activity

fix(google-auth): popup.

Browse source
This commit is contained in:
hristoterezov 2018-06-12 17:39:56 -05:00 committed by Hristo Terezov
parent decb351ed3
commit 1d229dd9ec
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/features/conference/components/Conference.js
View file

@ -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);

9
main.js
View file

@ -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);
}