Merge remote-tracking branch 'origin/nightly' into release

4 files changed, 9 insertions, 5 deletions

diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index 603049c4e..5305d5618 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -28,9 +28,10 @@ export default (params) => {
           }
 
           if (args.action === 'check') {
+            debug('checking for update');
             autoUpdater.checkForUpdates();
           } else if (args.action === 'install') {
-            debug('install update');
+            debug('installing update');
             autoUpdater.quitAndInstall();
             // we need to send a quit event
             setTimeout(() => {
diff --git a/src/internal-server b/src/internal-server
-Subproject e4fc9c6c3666eadc26a472b9b1c2a701dd3464b
+Subproject 71d77a3776946a46acad03a8484f8fa3c4b42bf
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index ac6ca6d2d..bbb5e6305 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -180,7 +180,7 @@ export default class AppStore extends Store {
       }
     });
 
-    // Handle deep linking (franz://)
+    // Handle deep linking (ferdi://)
     ipcRenderer.on('navigateFromDeepLink', (event, data) => {
       debug('Navigate from deep link', data);
       let {
@@ -389,6 +389,7 @@ export default class AppStore extends Store {
 
   @action _checkForUpdates() {
     if (this.isOnline) {
+      debug('_checkForUpdates: sending event to autoUpdate:check');
       this.updateStatus = this.updateStatusTypes.CHECKING;
       ipcRenderer.send('autoUpdate', {
         action: 'check',
@@ -399,6 +400,7 @@ export default class AppStore extends Store {
   }
 
   @action _installUpdate() {
+    debug('_installUpdate: sending event to autoUpdate:install');
     ipcRenderer.send('autoUpdate', {
       action: 'install',
     });
diff --git a/src/webview/contextMenuBuilder.js b/src/webview/contextMenuBuilder.js
index 500a1a653..63eed2ebe 100644
--- a/src/webview/contextMenuBuilder.js
+++ b/src/webview/contextMenuBuilder.js
@@ -22,6 +22,7 @@ function matchesWord(string) {
   return string.match(regex);
 }
 
+// TODO: Need to externalize for i18n
 const contextMenuStringTable = {
   lookUpDefinition: ({ word }) => `Look Up "${word}"`,
   cut: () => 'Cut',
@@ -217,7 +218,7 @@ module.exports = class ContextMenuBuilder {
     this.addSeparator(menu);
     this.goBack(menu);
     this.goForward(menu);
-    this.copyPageUrl(menu);
+    this.copyPageUrl(menu, menuInfo);
     this.goToHomePage(menu, menuInfo);
     this.openInBrowser(menu, menuInfo);
 
@@ -514,13 +515,13 @@ module.exports = class ContextMenuBuilder {
   /**
    * Adds the 'copy page url' menu item.
    */
-  copyPageUrl(menu) {
+  copyPageUrl(menu, menuInfo) {
     menu.append(new MenuItem({
       label: this.stringTable.copyPageUrl(),
       enabled: true,
       click: () => {
         clipboard.writeText(window.location.href);
-        this._sendNotificationOnClipboardEvent(menu.clipboardNotifications, () => `Page URL copied: ${window.location.href}`);
+        this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Page URL copied: ${window.location.href}`);
       },
     }));