diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-06-05 13:39:01 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-06-05 13:39:01 +0200 |
| commit | f4cc460ca56298d3cc270c64eb63cc25ff763c29 (patch) | |
| tree | 733f9cd7697a8ce792c38634405a0b83e71ef93d | |
| parent | 531b4cee31778a0e4710eeb3c79c533be93d4192 (diff) | |
| parent | 89b6417f86ff03c5c9fdbf82cac0453d9fcf3df9 (diff) | |
| download | mullvadvpn-f4cc460ca56298d3cc270c64eb63cc25ff763c29.tar.xz mullvadvpn-f4cc460ca56298d3cc270c64eb63cc25ff763c29.zip | |
Merge branch 'electron-2.0'
| -rw-r--r-- | app/app.js | 2 | ||||
| -rw-r--r-- | flow-libs/electron.js.flow | 2 | ||||
| -rw-r--r-- | package.json | 6 | ||||
| -rw-r--r-- | yarn.lock | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app/app.js b/app/app.js index 1133a2b4fe..0a23db9b86 100644 --- a/app/app.js +++ b/app/app.js @@ -104,7 +104,7 @@ updateTrayIcon(); ////////////////////////////////////////////////////////////////////////// // disable smart pinch. -webFrame.setZoomLevelLimits(1, 1); +webFrame.setVisualZoomLevelLimits(1, 1); ipcRenderer.send('on-browser-window-ready'); diff --git a/flow-libs/electron.js.flow b/flow-libs/electron.js.flow index 8c2a9f8bcc..9ff6242389 100644 --- a/flow-libs/electron.js.flow +++ b/flow-libs/electron.js.flow @@ -109,7 +109,7 @@ declare module 'electron' { // http://electron.atom.io/docs/api/web-frame declare class WebFrame extends EventEmitter { - setZoomLevelLimits(minimumLevel: number, maximumLevel: number): void; + setVisualZoomLevelLimits(minimumLevel: number, maximumLevel: number): void; } // http://electron.atom.io/docs/api/ipc-renderer diff --git a/package.json b/package.json index 420e032361..6e2d0020ac 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "validated": "^1.1.0" }, "optionalDependencies": { - "nseventmonitor": "https://github.com/mullvad/NSEventMonitor.git#0.0.8", - "windows-security": "https://github.com/mullvad/windows-security.git#0.0.4" + "nseventmonitor": "https://github.com/mullvad/NSEventMonitor.git#0.0.9", + "windows-security": "https://github.com/mullvad/windows-security.git#0.0.5" }, "devDependencies": { "babel-cli": "^6.22.2", @@ -48,7 +48,7 @@ "browser-sync": "^2.23.6", "chai": "^4.1.0", "cross-env": "^5.1.3", - "electron": "^1.8.2", + "electron": "^2.0.2", "electron-builder": "^19.37.2", "electron-devtools-installer": "^2.2.1", "electron-mocha": "^5.0.0", @@ -2774,9 +2774,9 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@^1.8.2: - version "1.8.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.3.tgz#001416ea3a25ce594e317cb5531bc41eadd22f7f" +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" |