feat(Services): Improve handling of external links

2 files changed, 18 insertions, 2 deletions

diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 87ee57a0d..bd5014aaa 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -336,6 +336,10 @@ export default class ServicesStore extends Store {
           redirect: false,
         });
       }
+    } else if (channel === 'new-window') {
+      const url = args[0];
+
+      this.actions.app.openExternalUrl({ url });
     }
   }
 
diff --git a/src/webview/plugin.js b/src/webview/plugin.js
index 9903ee07a..d9e021e6d 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -5,8 +5,8 @@ import path from 'path';
 import { isDevMode } from '../environment';
 import RecipeWebview from './lib/RecipeWebview';
 
-import Spellchecker from './spellchecker.js';
-import './notifications.js';
+import Spellchecker from './spellchecker';
+import './notifications';
 
 ipcRenderer.on('initializeRecipe', (e, data) => {
   const modulePath = path.join(data.recipe.path, 'webview.js');
@@ -39,3 +39,15 @@ ipcRenderer.on('settings-update', (e, data) => {
 document.addEventListener('DOMContentLoaded', () => {
   ipcRenderer.sendToHost('hello');
 }, false);
+
+// Patching window.open
+const originalWindowOpen = window.open;
+
+window.open = (url, frameName, features) => {
+  // We need to differentiate if the link should be opened in a popup or in the systems default browser 
+  if (!frameName && !features) {
+    return ipcRenderer.sendToHost('new-window', url);
+  }
+
+  return originalWindowOpen(url, frameName, features);
+};