Remove mouse-forward-back

Author: christianbundy

.travis.yml

@@ -33,17 +33,10 @@ before_install:
         libxext-dev \
         libxkbfile-dev \
         libxtst-dev
-    else
-      npm uninstall --save mouse-forward-back
-    fi
-  - |
-    if [ "$TRAVIS_OS_NAME" == "windows" ]; then
-      npm install --global windows-build-tools
     fi
 
 script: npm test && npm run dist
 
-
 branches:
   only:
   - master

index.js

@@ -55,6 +55,17 @@ electron.app.on('ready', () => {
     server: !(process.argv.includes('-g') || process.argv.includes('--use-global-ssb'))
   }, () => {
     const browserWindow = openMainWindow()
+
+    browserWindow.on('app-command', (e, cmd) => {
+      if (cmd === 'browser-backward' && browserWindow.webContents.canGoBack()) {
+        electron.ipcRenderer.send('goBack')
+      }
+
+      if (cmd === 'browser-forward' && browserWindow.webContents.canGoForward()) {
+        electron.ipcRenderer.send('goForward')
+      }
+    })
+
     const menu = defaultMenu(electron.app, electron.shell)
 
     menu.splice(4, 0, {

lib/main-window.js

@@ -16,14 +16,6 @@ const requireStyle = require('require-style')
 const ssbUri = require('ssb-uri')
 const pull = require('pull-stream')
 
-let mouseForwardBack
-
-try {
-  mouseForwardBack = require('mouse-forward-back')
-} catch (err) {
-  mouseForwardBack = false
-}
-
 module.exports = function (config) {
   const sockets = combine(
     overrideConfig(config),
@@ -144,17 +136,6 @@ module.exports = function (config) {
   electron.ipcRenderer.on('goForward', views.goForward)
   electron.ipcRenderer.on('goBack', views.goBack)
 
-  if (mouseForwardBack) {
-    mouseForwardBack.register((direction) => {
-      if (direction === 'back') {
-        views.goBack()
-      } else if (direction === 'forward') {
-        views.goForward()
-      }
-    },
-    electron.remote.getCurrentWindow().getNativeWindowHandle())
-  }
-
   document.head.appendChild(
     h('style', {
       innerHTML: computed(api.settings.obs.get('patchwork.theme', 'light'), themeName => {

package-lock.json

@@ -106,9 +106,7 @@
     "electron-builder": "^21.2.0",
     "standard": "^14.3.1"
   },
-  "optionalDependencies": {
-    "mouse-forward-back": "^1.0.1"
-  },
+  "optionalDependencies": {},
   "build": {
     "appId": "org.ssbc.patchwork",
     "linux": {