Merge remote-tracking branch 'upstream/master' into update_application_config

README.md

@@ -174,7 +174,7 @@ React.js (Framework to work with Frontend UI):
 https://reactjs.org/docs/getting-started.html
 
 Material UI (React components that implement Google's Material Design.):
-https://material-ui.com/getting-started
+https://material-ui.com/getting-started/installation
 
 ### Privacy
 

package.json

@@ -27,11 +27,11 @@
     "es6-error": "^4.1.1",
     "fn-getter": "^1.0.0",
     "iso-639-1": "^2.1.0",
-    "languagedetect": "^1.3.0",
+    "languagedetect": "^2.0.0",
     "location-history": "^1.1.1",
     "material-ui": "^0.20.2",
     "mkdirp": "^0.5.1",
-    "music-metadata": "^4.8.2",
+    "music-metadata": "4.9.2",
     "network-address": "^1.1.2",
     "parse-torrent": "^7.0.1",
     "prettier-bytes": "^1.0.4",
@@ -52,14 +52,14 @@
     "babel-eslint": "^10.0.3",
     "buble": "^0.19.8",
     "cross-zip": "^2.1.6",
-    "depcheck": "^0.8.3",
+    "depcheck": "^0.9.0",
-    "electron": "~7.0.0",
+    "electron": "~7.1.0",
     "electron-osx-sign": "^0.4.14",
     "electron-packager": "^14.0.6",
     "electron-winstaller": "^4.0.0",
     "gh-release": "^3.5.0",
     "minimist": "^1.2.0",
-    "nodemon": "^1.19.4",
+    "nodemon": "^2.0.0",
     "open": "^7.0.0",
     "plist": "^3.0.1",
     "pngjs": "^3.4.0",

src/main/windows/about.js

@@ -15,7 +15,7 @@ function init () {
     backgroundColor: '#ECECEC',
     center: true,
     fullscreen: false,
-    height: 170,
+    height: 250,
     icon: getIconPath(),
     maximizable: false,
     minimizable: false,
@@ -33,11 +33,12 @@ function init () {
 
   win.loadURL(config.WINDOW_ABOUT)
 
-  // No menu on the About window
-  win.setMenu(null)
-
   win.once('ready-to-show', function () {
     win.show()
+    // No menu on the About window
+    // Hack: BrowserWindow removeMenu method not working on electron@7
+    // https://github.com/electron/electron/issues/21088
+    win.setMenuBarVisibility(false)
   })
 
   win.once('closed', function () {

src/renderer/controllers/torrent-list-controller.js

@@ -296,18 +296,19 @@ module.exports = class TorrentListController {
       filters: [
         { name: 'Torrent Files', extensions: ['torrent'] },
         { name: 'All Files', extensions: ['*'] }
-      ]
+      ],
+      buttonLabel: 'Save'
     }
 
-    electron.remote.dialog.showSaveDialog(win, opts, function (savePath) {
+    const savePath = electron.remote.dialog.showSaveDialogSync(win, opts)
-      console.log('Saving torrent ' + torrentKey + ' to ' + savePath)
+
-      if (!savePath) return // They clicked Cancel
+    if (!savePath) return // They clicked Cancel
-      const torrentPath = TorrentSummary.getTorrentPath(torrentSummary)
+    console.log('Saving torrent ' + torrentKey + ' to ' + savePath)
-      fs.readFile(torrentPath, function (err, torrentFile) {
+    const torrentPath = TorrentSummary.getTorrentPath(torrentSummary)
+    fs.readFile(torrentPath, function (err, torrentFile) {
+      if (err) return dispatch('error', err)
+      fs.writeFile(savePath, torrentFile, function (err) {
         if (err) return dispatch('error', err)
-        fs.writeFile(savePath, torrentFile, function (err) {
-          if (err) return dispatch('error', err)
-        })
       })
     })
   }

static/about.html

@@ -32,8 +32,8 @@
     <p>
       Version <script>document.write(require('../package.json').version)</script>
       (<script>document.write(require('webtorrent/package.json').version)</script>)
-      (<script>document.write(process.arch === 'x64' ? '64-bit' : '32-bit')</script>)
+      (<script>document.write(process.arch)</script>)
     </p>
-    <p><script>document.write(require('../config').APP_COPYRIGHT)</script></p>
+    <p><script>document.write(require('../build/config').APP_COPYRIGHT)</script></p>
   </body>
 </html>