From 4cacab45ba849aed44a46cc797d6599ce530739b Mon Sep 17 00:00:00 2001
From: stnkl <stnkl@users.noreply.github.com>
Date: Thu, 3 Jun 2021 00:05:30 +0200
Subject: Adjust link opening behavior

---
 src/index.js          | 14 ++++++--------
 src/models/Service.js | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/index.js b/src/index.js
index 018bdc059..21cf61c0c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -438,14 +438,12 @@ ipcMain.on('feature-basic-auth-credentials', (e, { user, password }) => {
   authCallback = noop;
 });
 
-ipcMain.on('open-browser-window', (e, { disposition, url, serviceId }) => {
-  if (disposition === 'foreground-tab') {
-    const serviceSession = session.fromPartition(`persist:service-${serviceId}`);
-    const child = new BrowserWindow({ parent: mainWindow, webPreferences: { session: serviceSession } });
-    child.show();
-    child.loadURL(url);
-  }
-  debug('Received open-browser-window', disposition, url);
+ipcMain.on('open-browser-window', (e, { url, serviceId }) => {
+  const serviceSession = session.fromPartition(`persist:service-${serviceId}`);
+  const child = new BrowserWindow({ parent: mainWindow, webPreferences: { session: serviceSession } });
+  child.show();
+  child.loadURL(url);
+  debug('Received open-browser-window', url);
 });
 
 ipcMain.on('modifyRequestHeaders', (e, { modifiedRequestHeaders, serviceId }) => {
diff --git a/src/models/Service.js b/src/models/Service.js
index e7efbe30e..b01881beb 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -291,23 +291,21 @@ export default class Service {
       if (!isValidExternalURL(event.url)) {
         return;
       }
-      if (event.disposition === 'foreground-tab') {
-        ipcRenderer.send('open-browser-window', {
-          disposition: event.disposition,
-          url: event.url,
-          serviceId: this.id,
-        });
-      } else {
+      if (event.disposition === 'foreground-tab' || event.disposition === 'background-tab') {
         openWindow({
           event,
           url,
           frameName,
           options,
         });
+      } else {
+        ipcRenderer.send('open-browser-window', {
+          url: event.url,
+          serviceId: this.id,
+        });
       }
     });
 
-
     this.webview.addEventListener('will-navigate', event => handleUserAgent(event.url, true));
 
     this.webview.addEventListener('did-start-loading', (event) => {
-- 
cgit v1.2.3-70-g09d2