Merge pull request #1199 from ssbc/update-deps

Unbreak the build (upgrade npm dependencies)

Author: christianbundy

.travis.yml

@@ -33,13 +33,10 @@ before_install:
         libxext-dev \
         libxkbfile-dev \
         libxtst-dev
-    else
-      npm uninstall --save mouse-forward-back
     fi
 
 script: npm test && npm run dist
 
-
 branches:
   only:
   - master

index.js

@@ -55,6 +55,20 @@ electron.app.on('ready', () => {
     server: !(process.argv.includes('-g') || process.argv.includes('--use-global-ssb'))
   }, () => {
     const browserWindow = openMainWindow()
+
+    browserWindow.on('app-command', (e, cmd) => {
+      switch (cmd) {
+        case 'browser-backward': {
+          browserWindow.webContents.send('goBack')
+          break
+        }
+        case 'browser-forward': {
+          browserWindow.webContents.send('goForward')
+          break
+        }
+      }
+    })
+
     const menu = defaultMenu(electron.app, electron.shell)
 
     menu.splice(4, 0, {
@@ -152,6 +166,7 @@ function openMainWindow () {
       backgroundColor: '#EEE',
       icon: Path.join(__dirname, 'assets/icon.png')
     })
+
     windowState.manage(windows.main)
     windows.main.setSheetOffset(40)
     windows.main.on('close', function (e) {

lib/context-menu-and-spellcheck.js

@@ -6,13 +6,13 @@ const ref = require('ssb-ref')
 let navigateHandler = null
 module.exports = setupContextMenuAndSpellCheck
 
-function setupContextMenuAndSpellCheck (config, { navigate, getMessageText }) {
+function setupContextMenuAndSpellCheck (config, { navigate, getMessageText, language }) {
   navigateHandler = navigate
   const spellCheckHandler = new SpellCheckHandler()
   spellCheckHandler.attachToInput()
 
   // Start off as US English, America #1 (lol)
-  spellCheckHandler.switchLanguage('en-US')
+  spellCheckHandler.switchLanguage(language || 'en-US')
 
   const contextMenuBuilder = new ContextMenuBuilder(spellCheckHandler, null, true, (menu, menuInfo) => {
     const ddg = new MenuItem({

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),
@@ -57,7 +49,8 @@ module.exports = function (config) {
   }))
 
   const i18n = api.intl.sync.i18n
-  setupContextMenuAndSpellCheck(api.config.sync.load(), { navigate, getMessageText })
+  const language = api.settings.obs.get('patchwork.lang', '')()
+  setupContextMenuAndSpellCheck(api.config.sync.load(), { navigate, getMessageText, language })
 
   const id = api.keys.sync.id()
   const latestUpdate = LatestUpdate()
@@ -138,23 +131,12 @@ module.exports = function (config) {
   const pendingCount = views.get('/mentions').pendingUpdates
 
   watch(pendingCount, count => {
-    electron.remote.app.setBadgeCount(count)
+    electron.remote.app.badgeCount = count
   })
 
   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 => {
@@ -330,26 +312,25 @@ module.exports = function (config) {
     const element = h('a -drop', {
       'ev-click': () => {
         const rects = element.getBoundingClientRect()
-        electron.remote.getCurrentWindow().webContents.getZoomFactor((factor) => {
-          const menu = electron.remote.Menu.buildFromTemplate(items.map(item => {
-            if (typeof item === 'function') {
-              return item()
-            } else if (item.separator) {
-              return { type: 'separator' }
-            } else {
-              return {
-                label: item[0],
-                click () {
-                  navigate(item[1])
-                }
+        const factor = electron.remote.getCurrentWindow().webContents.zoomFactor
+        const menu = electron.remote.Menu.buildFromTemplate(items.map(item => {
+          if (typeof item === 'function') {
+            return item()
+          } else if (item.separator) {
+            return { type: 'separator' }
+          } else {
+            return {
+              label: item[0],
+              click () {
+                navigate(item[1])
               }
             }
-          }))
-          menu.popup({
-            window: electron.remote.getCurrentWindow(),
-            x: Math.round(rects.left * factor),
-            y: Math.round(rects.bottom * factor) + 4
-          })
+          }
+        }))
+        menu.popup({
+          window: electron.remote.getCurrentWindow(),
+          x: Math.round(rects.left * factor),
+          y: Math.round(rects.bottom * factor) + 4
         })
       }
     }, title)
@@ -436,7 +417,7 @@ module.exports = function (config) {
       if (value.content.type === 'gathering') {
         api.about.async.latestValues(id, ['title', 'description'], (err, values) => {
           if (err) return cb(err)
-          var text = `# ${values.title}\n\n${values.description}`
+          const text = `# ${values.title}\n\n${values.description}`
           cb(null, text)
         })
       } else {

lib/window.js

@@ -4,7 +4,10 @@ const extend = require('xtend/mutable')
 
 module.exports = function Window (config, path, opts) {
   const window = new electron.BrowserWindow(extend({
-    show: false
+    show: false,
+    webPreferences: {
+      nodeIntegration: true // XXX: Maybe not always necessary (?)
+    }
   }, opts))
 
   electron.ipcMain.on('ready-to-show', handleReadyToShow)

locales/es.json

@@ -239,7 +239,7 @@
 	"Hide details": "Ocultar detalles",
 	"Show details": "Mostrar detalles",
 	"forked from parent thread ": "bifurcó de padre hilo ",
-	"Browse Recently Active": "Ve	recién activo",
+	"Browse Recently Active": "Ve recién activo",
 	"el": "el",
 	"eo": "eo",
 	"fr": "fr",