From 3b1dd4e008e822269e49379863fb72582a5bdedc Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com>
Date: Tue, 6 Oct 2020 14:34:01 -0700
Subject: [PATCH] open external links in system browser

---
 src/main/index.js        | 7 ++++++-
 src/renderer/about.jsx   | 1 -
 src/renderer/app.jsx     | 8 +-------
 src/renderer/privacy.jsx | 7 +++++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index 6362996..8977a3d 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -1,4 +1,4 @@
-import {BrowserWindow, Menu, app, dialog, ipcMain, systemPreferences} from 'electron';
+import {BrowserWindow, Menu, app, dialog, ipcMain, shell, systemPreferences} from 'electron';
 import fs from 'fs-extra';
 import path from 'path';
 import {URL} from 'url';
@@ -193,6 +193,11 @@ const createWindow = ({search = null, url = 'index.html', ...browserWindowOption
         }
     });
 
+    webContents.on('new-window', (event, newWindowUrl) => {
+        shell.openExternal(newWindowUrl);
+        event.preventDefault();
+    });
+
     const fullUrl = makeFullUrl(url, search);
     window.loadURL(fullUrl);
 
diff --git a/src/renderer/about.jsx b/src/renderer/about.jsx
index 17ffef1..b07c2e4 100644
--- a/src/renderer/about.jsx
+++ b/src/renderer/about.jsx
@@ -5,7 +5,6 @@ import {productName, version} from '../../package.json';
 import logo from '../icon/ScratchDesktop.svg';
 import styles from './about.css';
 
-// TODO: localization?
 const AboutElement = () => (
     <div className={styles.aboutBox}>
         <div><img
diff --git a/src/renderer/app.jsx b/src/renderer/app.jsx
index 1fe1a37..4ed002e 100644
--- a/src/renderer/app.jsx
+++ b/src/renderer/app.jsx
@@ -1,4 +1,4 @@
-import {ipcRenderer, remote, shell} from 'electron';
+import {ipcRenderer, remote} from 'electron';
 import bindAll from 'lodash.bindall';
 import omit from 'lodash.omit';
 import PropTypes from 'prop-types';
@@ -28,12 +28,6 @@ import ElectronStorageHelper from '../common/ElectronStorageHelper';
 
 import styles from './app.css';
 
-// override window.open so that it uses the OS's default browser, not an electron browser
-window.open = function (url, target) {
-    if (target === '_blank') {
-        shell.openExternal(url);
-    }
-};
 // Register "base" page view
 // analytics.pageview('/');
 
diff --git a/src/renderer/privacy.jsx b/src/renderer/privacy.jsx
index 52e9901..a433acc 100644
--- a/src/renderer/privacy.jsx
+++ b/src/renderer/privacy.jsx
@@ -3,7 +3,6 @@ import ReactDOM from 'react-dom';
 
 import styles from './privacy.css';
 
-// TODO: localization?
 const PrivacyElement = () => (
     <div className={styles.privacyBox}>
         <h1>Privacy Policy</h1>
@@ -11,7 +10,11 @@ const PrivacyElement = () => (
             We understand how important privacy is to our community, especially children and their parents. We wrote
             this privacy policy to explain what information we collect through the Scratch application (the
             &ldquo;App&rdquo;), how we use it, and what we&apos;re doing to keep it safe. If you have any questions
-            regarding this privacy policy, you can <a href="https://scratch.mit.edu/contact-us">contact us</a>.
+            regarding this privacy policy, you can <a
+                href="https://scratch.mit.edu/contact-us/"
+                target="_blank"
+                rel="noopener noreferrer"
+            >contact us</a>.
         </p>
         <h2>What information does the App collect?</h2>
         <p>