Only register app-command listeners on windows

irccloud · May 17, 2019 · 7286621 · 7286621
1 parent 694923a
commit 7286621
Showing 1 changed file with 35 additions and 31 deletions.
diff --git a/app/main.js b/app/main.js
@@ -262,21 +262,6 @@ function openMainWindow(opts) {
     log.debug('closed');
     mainWindow = null;
   });
-
-  mainWindow.on('swipe', function (e, direction) {
-    switch (direction) {
-    case 'right':
-      if (mainWindow.webContents.canGoForward()) {
-        mainWindow.webContents.goForward();
-      }
-      break;
-    case 'left':
-      if (mainWindow.webContents.canGoBack()) {
-        mainWindow.webContents.goBack();
-      }
-      break;
-    }
-  });
 
   mainWindow.on('page-title-updated', function(event) {
     var title = mainWindow.getTitle();
@@ -289,30 +274,49 @@ function openMainWindow(opts) {
       app.dock.setBadge(unread);
     }
   });
-
-  mainWindow.on('app-command', function (e, cmd) {
-    switch (cmd) {
-    case 'browser-backward':
-      if (mainWindow.webContents.canGoBack()) {
-        e.preventDefault();
-        mainWindow.webContents.goBack();
-      }
-      break;
-    case 'browser-forward':
+
+  mainWindow.on('swipe', function (e, direction) {
+    switch (direction) {
+    case 'right':
       if (mainWindow.webContents.canGoForward()) {
-        e.preventDefault();
         mainWindow.webContents.goForward();
       }
       break;
-    case 'browser-refresh':
-      e.preventDefault();
-      mainWindow.webContents.reloadIgnoringCache();
-      break;
-    default:
+    case 'left':
+      if (mainWindow.webContents.canGoBack()) {
+        mainWindow.webContents.goBack();
+      }
       break;
     }
   });
 
+  // This is apparently not needed on linux, and results in double actions
+  // despite the documentation
+  // https://github.com/electron/electron/issues/18322
+  // https://github.com/irccloud/irccloud-desktop/issues/86
+  // macOS doesn't use app-command
+  if (is.windows()) {
+    mainWindow.on('app-command', function (e, cmd) {
+      switch (cmd) {
+      case 'browser-backward':
+        if (mainWindow.webContents.canGoBack()) {
+          mainWindow.webContents.goBack();
+        }
+        break;
+      case 'browser-forward':
+        if (mainWindow.webContents.canGoForward()) {
+          mainWindow.webContents.goForward();
+        }
+        break;
+      case 'browser-refresh':
+        mainWindow.webContents.reloadIgnoringCache();
+        break;
+      default:
+        break;
+      }
+    });
+  }
+
   ContextMenu(mainWindow);
 
   mainWindow.webContents.on('preload-error', function (event, preloadPath, error) {