diff options
author | Vijay A <avijayr@protonmail.com> | 2021-08-24 10:22:22 +0530 |
---|---|---|
committer | Vijay A <avijayr@protonmail.com> | 2021-08-24 10:22:22 +0530 |
commit | 2dc7b2fd3976853f3dc2f182f12cfe11c3b83688 (patch) | |
tree | 22fc7a9e4d3ddd2be16821c871259fb067c7df30 /src/index.js | |
parent | docs: upgraded version to 5.6.1-beta.1 (diff) | |
parent | 5.6.1-nightly.37 [skip ci] (diff) | |
download | ferdium-app-2dc7b2fd3976853f3dc2f182f12cfe11c3b83688.tar.gz ferdium-app-2dc7b2fd3976853f3dc2f182f12cfe11c3b83688.tar.zst ferdium-app-2dc7b2fd3976853f3dc2f182f12cfe11c3b83688.zip |
Merge remote-tracking branch 'origin/develop' into release
Diffstat (limited to 'src/index.js')
-rw-r--r-- | src/index.js | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/index.js b/src/index.js index 9146a23da..d2b0f56f4 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -1,6 +1,6 @@ | |||
1 | /* eslint-disable import/first */ | 1 | /* eslint-disable import/first */ |
2 | 2 | ||
3 | import { app, BrowserWindow, shell, ipcMain, session } from 'electron'; | 3 | import { app, BrowserWindow, ipcMain, session } from 'electron'; |
4 | 4 | ||
5 | import { emptyDirSync, ensureFileSync } from 'fs-extra'; | 5 | import { emptyDirSync, ensureFileSync } from 'fs-extra'; |
6 | import { join } from 'path'; | 6 | import { join } from 'path'; |
@@ -34,7 +34,7 @@ import { appId } from './package.json'; // eslint-disable-line import/no-unresol | |||
34 | import './electron/exception'; | 34 | import './electron/exception'; |
35 | 35 | ||
36 | import { asarPath } from './helpers/asar-helpers'; | 36 | import { asarPath } from './helpers/asar-helpers'; |
37 | import { isValidExternalURL } from './helpers/url-helpers'; | 37 | import { openExternalUrl } from './helpers/url-helpers'; |
38 | import userAgent from './helpers/userAgent-helpers'; | 38 | import userAgent from './helpers/userAgent-helpers'; |
39 | 39 | ||
40 | const debug = require('debug')('Ferdi:App'); | 40 | const debug = require('debug')('Ferdi:App'); |
@@ -342,12 +342,8 @@ const createWindow = () => { | |||
342 | app.isMaximized = mainWindow.isMaximized(); | 342 | app.isMaximized = mainWindow.isMaximized(); |
343 | 343 | ||
344 | mainWindow.webContents.on('new-window', (e, url) => { | 344 | mainWindow.webContents.on('new-window', (e, url) => { |
345 | debug('Open url', url); | ||
346 | e.preventDefault(); | 345 | e.preventDefault(); |
347 | 346 | openExternalUrl(url); | |
348 | if (isValidExternalURL(url)) { | ||
349 | shell.openExternal(url); | ||
350 | } | ||
351 | }); | 347 | }); |
352 | 348 | ||
353 | if (settings.get('startMinimized')) { | 349 | if (settings.get('startMinimized')) { |
@@ -392,10 +388,9 @@ app.on('ready', () => { | |||
392 | enforceMacOSAppLocation(); | 388 | enforceMacOSAppLocation(); |
393 | 389 | ||
394 | // Register App URL | 390 | // Register App URL |
395 | if (isDevMode) { | 391 | const protocolClient = isDevMode ? 'ferdi-dev' : 'ferdi'; |
396 | app.setAsDefaultProtocolClient('ferdi-dev'); | 392 | if (!app.isDefaultProtocolClient(protocolClient)) { |
397 | } else { | 393 | app.setAsDefaultProtocolClient(protocolClient); |
398 | app.setAsDefaultProtocolClient('ferdi'); | ||
399 | } | 394 | } |
400 | 395 | ||
401 | if (isWindows) { | 396 | if (isWindows) { |
@@ -455,7 +450,12 @@ ipcMain.on('open-browser-window', (e, { url, serviceId }) => { | |||
455 | const serviceSession = session.fromPartition(`persist:service-${serviceId}`); | 450 | const serviceSession = session.fromPartition(`persist:service-${serviceId}`); |
456 | const child = new BrowserWindow({ | 451 | const child = new BrowserWindow({ |
457 | parent: mainWindow, | 452 | parent: mainWindow, |
458 | webPreferences: { session: serviceSession }, | 453 | webPreferences: { |
454 | session: serviceSession, | ||
455 | // TODO: Aren't these needed here? | ||
456 | // contextIsolation: false, | ||
457 | // enableRemoteModule: true, | ||
458 | }, | ||
459 | }); | 459 | }); |
460 | child.show(); | 460 | child.show(); |
461 | child.loadURL(url); | 461 | child.loadURL(url); |