6 files changed, 83 insertions, 20 deletions

diff --git a/.babelrc b/.babelrc
index 3ea65a54e..0e81c4ef9 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,14 +1,31 @@
 {
   "presets": [
-    "@babel/env",
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "electron": 2
+        }
+      }
+    ],
     "@babel/react"
   ],
   "plugins": [
-    ["@babel/plugin-proposal-decorators", { "legacy": true }],
+    [
+      "@babel/plugin-proposal-decorators",
+      {
+        "legacy": true
+      }
+    ],
     "@babel/proposal-export-default-from",
-    ["@babel/proposal-class-properties", { "loose": true }],
+    [
+      "@babel/proposal-class-properties",
+      {
+        "loose": true
+      }
+    ],
     "@babel/proposal-throw-expressions",
     "@babel/syntax-dynamic-import"
   ],
   "sourceMaps": "inline"
-}
+}
\ No newline at end of file
diff --git a/src/config.js b/src/config.js
index c612d1e2b..ba3af14b9 100644
--- a/src/config.js
+++ b/src/config.js
@@ -39,7 +39,7 @@ export const DEFAULT_FEATURES_CONFIG = {
   isServiceProxyPremiumFeature: true,
 };
 
-export const FRANZ_SERVICE_REQUEST = 'hhttp://bit.ly/franz-plugin-docs';
+export const FRANZ_SERVICE_REQUEST = 'https://bit.ly/franz-plugin-docs';
 export const FRANZ_TRANSLATION = 'https://bit.ly/franz-translate';
 
 export const FILE_SYSTEM_SETTINGS_TYPES = [
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index 9ccc89ea2..83dd83712 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -7,6 +7,7 @@ export default (params) => {
   if (process.platform === 'darwin' || process.platform === 'win32') {
     ipcMain.on('autoUpdate', (event, args) => {
       try {
+        autoUpdater.autoInstallOnAppQuit = false;
         autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta'));
         if (args.action === 'check') {
           autoUpdater.checkForUpdates();
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index cad9844fd..ee0b4e79c 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -21,24 +21,24 @@ export default function init(stores) {
     config.isEnabled = isServiceProxyEnabled !== undefined ? isServiceProxyEnabled : DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled;
     config.isPremium = isServiceProxyPremiumFeature !== undefined ? isServiceProxyPremiumFeature : DEFAULT_FEATURES_CONFIG.isServiceProxyPremiumFeature;
 
-    const services = stores.services.all;
+    const services = stores.services.enabled;
     const isPremiumUser = stores.user.data.isPremium;
 
     services.forEach((service) => {
       const s = session.fromPartition(`persist:service-${service.id}`);
-      let proxyHost = 'direct://';
 
       if (config.isEnabled && (isPremiumUser || !config.isPremium)) {
         const serviceProxyConfig = stores.settings.proxy[service.id];
 
         if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
-          proxyHost = serviceProxyConfig.host;
+          const proxyHost = serviceProxyConfig.host;
+          debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost);
+
+          s.setProxy({ proxyRules: proxyHost }, () => {
+            debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`);
+          });
         }
       }
-
-      s.setProxy({ proxyRules: proxyHost }, (e) => {
-        debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`, e);
-      });
     });
   });
 }
diff --git a/src/index.js b/src/index.js
index 663f81cc9..37c553840 100644
--- a/src/index.js
+++ b/src/index.js
@@ -115,7 +115,7 @@ const createWindow = () => {
   mainWindow.loadURL(`file://${__dirname}/index.html`);
 
   // Open the DevTools.
-  if (isDevMode) {
+  if (isDevMode || process.argv.includes('--devtools')) {
     mainWindow.webContents.openDevTools();
   }
 
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index 195306fda..ad156128c 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -3,7 +3,7 @@
 
 import { clipboard, remote, ipcRenderer, shell } from 'electron';
 
-import { isDevMode } from '../environment';
+import { isDevMode, isMac } from '../environment';
 
 const debug = require('debug')('Franz:contextMenu');
 
@@ -23,19 +23,31 @@ function delUnusedElements(menuTpl) {
 
 const buildMenuTpl = (props, suggestions) => {
   const { editFlags } = props;
-  const hasText = props.selectionText.trim().length > 0;
+  const textSelection = props.selectionText.trim();
+  const hasText = textSelection.length > 0;
   const can = type => editFlags[`can${type}`] && hasText;
 
-  console.log(props);
+  const canGoBack = webContents.canGoBack();
+  const canGoForward = webContents.canGoForward();
 
   let menuTpl = [
     {
       type: 'separator',
     }, {
+      id: 'lookup',
+      label: `Look Up "${textSelection.length > 15 ? `${textSelection.slice(0, 15)}...` : textSelection}"`,
+      visible: isMac && props.mediaType === 'none' && hasText,
+      click() {
+        debug('Show definition for selection', textSelection);
+        webContents.showDefinitionForSelection();
+      },
+    }, {
+      type: 'separator',
+    }, {
       id: 'cut',
       role: can('Cut') ? 'cut' : '',
       enabled: can('Cut'),
-      visible: !!props.selectionText.trim(),
+      visible: hasText && props.isEditable,
     }, {
       id: 'copy',
       label: 'Copy',
@@ -50,6 +62,18 @@ const buildMenuTpl = (props, suggestions) => {
       visible: props.isEditable,
     }, {
       type: 'separator',
+      visible: props.isEditable && hasText,
+    }, {
+      id: 'searchTextSelection',
+      label: `Search Google for "${textSelection.length > 15 ? `${textSelection.slice(0, 15)}...` : textSelection}"`,
+      visible: hasText,
+      click() {
+        const url = `https://www.google.com/search?q=${textSelection}`;
+        debug('Search on Google', url);
+        shell.openExternal(url);
+      },
+    }, {
+      type: 'separator',
     },
   ];
 
@@ -60,6 +84,7 @@ const buildMenuTpl = (props, suggestions) => {
       id: 'openLink',
       label: 'Open Link in Browser',
       click() {
+        debug('Open link in Browser', props.linkURL);
         shell.openExternal(props.linkURL);
       },
     }, {
@@ -83,6 +108,7 @@ const buildMenuTpl = (props, suggestions) => {
       id: 'openImage',
       label: 'Open Image in Browser',
       click() {
+        debug('Open image in Browser', props.srcURL);
         shell.openExternal(props.srcURL);
       },
     }, {
@@ -132,7 +158,6 @@ const buildMenuTpl = (props, suggestions) => {
     });
   }
 
-  console.log('suggestions', suggestions.length, suggestions);
   if (suggestions.length > 0) {
     suggestions.reverse().map(suggestion => menuTpl.unshift({
       id: `suggestion-${suggestion}`,
@@ -143,6 +168,28 @@ const buildMenuTpl = (props, suggestions) => {
     }));
   }
 
+  if (canGoBack || canGoForward) {
+    menuTpl.push({
+      type: 'separator',
+    }, {
+      id: 'goBack',
+      label: 'Go Back',
+      enabled: canGoBack,
+      click() {
+        webContents.goBack();
+      },
+    }, {
+      id: 'goForward',
+      label: 'Go Forward',
+      enabled: canGoForward,
+      click() {
+        webContents.goForward();
+      },
+    }, {
+      type: 'separator',
+    });
+  }
+
   if (isDevMode) {
     menuTpl.push({
       type: 'separator',
@@ -152,8 +199,6 @@ const buildMenuTpl = (props, suggestions) => {
       click() {
         webContents.inspectElement(props.x, props.y);
       },
-    }, {
-      type: 'separator',
     });
   }