Merge pull request BoostIO#2054 from clone1612/electron-2-compatibility

Upgrade Electron to v2.0.2
gorkarod · Jun 14, 2018 · c42e1a0 · c42e1a0
2 parents 720475d + 8dbf456
commit c42e1a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/main-window.js b/lib/main-window.js
@@ -17,7 +17,7 @@ const mainWindow = new BrowserWindow({
   autoHideMenuBar: showMenu,
   webPreferences: {
     zoomFactor: 1.0,
-    blinkFeatures: 'OverlayScrollbars'
+    enableBlinkFeatures: 'OverlayScrollbars'
   },
   icon: path.resolve(__dirname, '../resources/app.png')
 })

diff --git a/lib/main.html b/lib/main.html
@@ -115,7 +115,7 @@
   <script src="../node_modules/react-redux/dist/react-redux.min.js"></script>
   <script type='text/javascript'>
     const electron = require('electron')
-    electron.webFrame.setZoomLevelLimits(1, 1)
+    electron.webFrame.setVisualZoomLevelLimits(1, 1)
     var scriptUrl = window._.find(electron.remote.process.argv, (a) => a === '--hot')
       ? 'http://localhost:8080/assets/main.js'
       : '../compiled/main.js'

diff --git a/package.json b/package.json
@@ -120,7 +120,7 @@
     "css-loader": "^0.19.0",
     "devtron": "^1.1.0",
     "dom-storage": "^2.0.2",
-    "electron": "1.8.7",
+    "electron": "2.0.2",
     "electron-packager": "^6.0.0",
     "eslint": "^3.13.1",
     "eslint-config-standard": "^6.2.1",

diff --git a/yarn.lock b/yarn.lock
@@ -2577,9 +2577,9 @@ electron-winstaller@^2.2.0:
     lodash.template "^4.2.2"
     temp "^0.8.3"
 
-electron@1.8.7:
-  version "1.8.7"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.7.tgz#373c1dc4589d7ab4acd49aff8db4a1c0a6c3bcc1"
+electron@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.2.tgz#b77e05f83419cc5ec921a2d21f35b55e4bfc3d68"
   dependencies:
     "@types/node" "^8.0.24"
     electron-download "^3.0.1"