Merge remote-tracking branch 'origin/master' into windows

Conflicts:
	browser/main/HomePage.js
	browser/main/HomePage/ArticleNavigator.js
	webpack.config.js

atom-lib/finder-window.js

@@ -1,5 +1,6 @@
-var BrowserWindow = require('browser-window')
-var path = require('path')
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
+const path = require('path')
 
 var finderWindow = new BrowserWindow({
   width: 640,
@@ -18,7 +19,7 @@ var finderWindow = new BrowserWindow({
 
 var url = path.resolve(__dirname, '../browser/finder/index.html')
 
-finderWindow.loadUrl('file://' + url)
+finderWindow.loadURL('file://' + url)
 
 finderWindow.on('blur', function () {
   finderWindow.hide()

atom-lib/main-window.js

@@ -1,5 +1,6 @@
-var BrowserWindow = require('browser-window')
-var path = require('path')
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
+const path = require('path')
 
 var mainWindow = new BrowserWindow({
   width: 1080,
@@ -11,11 +12,9 @@ var mainWindow = new BrowserWindow({
   'standard-window': false
 })
 
-var url = path.resolve(__dirname, '../browser/main/index.html')
+const url = path.resolve(__dirname, '../browser/main/index.html')
 
-mainWindow.loadUrl('file://' + url)
-
-mainWindow.setVisibleOnAllWorkspaces(true)
+mainWindow.loadURL('file://' + url)
 
 mainWindow.webContents.on('new-window', function (e) {
   e.preventDefault()

atom-lib/menu-template.js

@@ -1,4 +1,6 @@
-var BrowserWindow = require('browser-window')
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
+const shell = electron.shell
 
 module.exports = [
   {
@@ -91,10 +93,13 @@ module.exports = [
         }
       },
       {
-        label: 'Toggle DevTools',
-        accelerator: 'Alt+Command+I',
-        click: function () {
-          BrowserWindow.getFocusedWindow().toggleDevTools()
+        label: 'Toggle Developer Tools',
+        accelerator: (function () {
+          if (process.platform === 'darwin') return 'Alt+Command+I'
+          else return 'Ctrl+Shift+I'
+        })(),
+        click: function (item, focusedWindow) {
+          if (focusedWindow) BrowserWindow.getFocusedWindow().toggleDevTools()
         }
       }
     ]
@@ -123,6 +128,24 @@ module.exports = [
   },
   {
     label: 'Help',
-    submenu: []
+    role: 'help',
+    submenu: [
+      {
+        label: 'Boost official site',
+        click: function () { shell.openExternal('https://b00st.io/') }
+      },
+      {
+        label: 'Tutorial page',
+        click: function () { shell.openExternal('https://b00st.io/tutorial.html') }
+      },
+      {
+        label: 'Discussions',
+        click: function () { shell.openExternal('https://github.com/BoostIO/boost-app-discussions/issues') }
+      },
+      {
+        label: 'Changelog',
+        click: function () { shell.openExternal('https://github.com/BoostIO/boost-releases/blob/master/changelog.md') }
+      }
+    ]
   }
 ]

atom-lib/updater.js

@@ -1,42 +0,0 @@
-var autoUpdater = require('auto-updater')
-var nn = require('node-notifier')
-var app = require('app')
-var path = require('path')
-
-var version = app.getVersion()
-var versionText = (version == null || version.length === 0) ? 'DEV version' : 'v' + version
-var versionNotified = false
-autoUpdater
-  .on('error', function (err, message) {
-    console.error(err)
-    console.error(message)
-    console.log(path.resolve(__dirname, '../resources/favicon-230x230.png'))
-    nn.notify({
-      title: 'Error! ' + versionText,
-      icon: path.resolve(__dirname, '../resources/favicon-230x230.png'),
-      message: message
-    })
-  })
-  // .on('checking-for-update', function () {
-  //   // Connecting
-  //   console.log('checking...')
-  // })
-  .on('update-available', function () {
-    nn.notify({
-      title: 'Update is available!! ' + versionText,
-      icon: path.resolve(__dirname, '../resources/favicon-230x230.png'),
-      message: 'Download started.. wait for the update ready.'
-    })
-  })
-  .on('update-not-available', function () {
-    if (!versionNotified) {
-      nn.notify({
-        title: 'Latest Build!! ' + versionText,
-        icon: path.resolve(__dirname, '../resources/favicon-230x230.png'),
-        message: 'Hope you to enjoy our app :D'
-      })
-      versionNotified = true
-    }
-  })
-
-module.exports = autoUpdater