diff --git a/jslib b/jslib index 2c43a5f06a..98e2e611f8 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 2c43a5f06a40a51d9733652e055327eff45fe009 +Subproject commit 98e2e611f8407b9c16735bafabf07eb6cd91ca53 diff --git a/package-lock.json b/package-lock.json index 5c75635e2d..a10476295a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2566,20 +2566,20 @@ "dev": true }, "electron": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.4.tgz", - "integrity": "sha512-2f1cx0G3riMFODXFftF5AHXy+oHfhpntZHTDN66Hxtl09gmEr42B3piNEod9MEmw72f75LX2JfeYceqq1PF8cA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.2.tgz", + "integrity": "sha512-XmkGVoHLOqmjZ2nU/0zEzMl3TZEz452Q1fTJFKjylg4pLYaq7na7V2uxzydVQNQukZGbERoA7ayjxXzTsXbtdA==", "dev": true, "requires": { - "@types/node": "8.10.8", + "@types/node": "8.10.17", "electron-download": "3.3.0", "extract-zip": "1.6.6" }, "dependencies": { "@types/node": { - "version": "8.10.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.8.tgz", - "integrity": "sha512-BvcUxNZe9JgiiUVivtiQt3NrPVu9OAQzkxR1Ko9ESftCYU7V6Np5kpDzQwxd+34lsop7SNRdL292Flv52OvCaw==", + "version": "8.10.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.17.tgz", + "integrity": "sha512-3N3FRd/rA1v5glXjb90YdYUa+sOB7WrkU2rAhKZnF4TKD86Cym9swtulGuH0p9nxo7fP5woRNa8b0oFTpCO1bg==", "dev": true } } @@ -3109,7 +3109,7 @@ "debug": "2.6.9", "detect-libc": "1.0.3", "fs-extra": "3.0.1", - "node-abi": "2.2.0", + "node-abi": "2.4.1", "node-gyp": "3.6.2", "ora": "1.4.0", "rimraf": "2.6.2", @@ -6554,9 +6554,9 @@ } }, "node-abi": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.2.0.tgz", - "integrity": "sha512-FqVC0WNNL8fQWQK3GYTESfwZXZKDbSIiEEIvufq7HV6Lj0IDDZRVa4CU/KTA0JVlqY9eTDSuPiC8FS9UfGVuzA==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.4.1.tgz", + "integrity": "sha512-pUlswqpHQ7zGPI9lGjZ4XDNIEUDbHxsltfIRb7dTnYdhgHWHOcB0MLZKLoCz6UMcGzSPG5wGl1HODZVQAUsH6w==", "dev": true, "requires": { "semver": "5.5.0" diff --git a/package.json b/package.json index 1051dfe074..da3a0d8e3c 100644 --- a/package.json +++ b/package.json @@ -200,7 +200,7 @@ "concurrently": "3.5.1", "copy-webpack-plugin": "^4.2.0", "css-loader": "^0.28.7", - "electron": "1.8.4", + "electron": "2.0.2", "electron-builder": "^20.8.1", "electron-rebuild": "1.7.3", "electron-reload": "1.2.2", @@ -210,6 +210,7 @@ "google-fonts-webpack-plugin": "^0.4.4", "html-loader": "^0.5.1", "html-webpack-plugin": "^2.30.1", + "node-abi": "^2.4.1", "node-loader": "^0.6.0", "node-sass": "^4.7.2", "rimraf": "^2.6.2", diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts index 85386c240d..15efdb9aaf 100644 --- a/src/app/vault/vault.component.ts +++ b/src/app/vault/vault.component.ts @@ -265,7 +265,7 @@ export class VaultComponent implements OnInit, OnDestroy { default: break; } - menu.popup(remote.getCurrentWindow()); + menu.popup({ window: remote.getCurrentWindow() }); } editCipher(cipher: CipherView) { @@ -307,7 +307,7 @@ export class VaultComponent implements OnInit, OnDestroy { label: this.i18nService.t('typeSecureNote'), click: () => this.addCipherWithChangeDetection(CipherType.SecureNote), })); - menu.popup(remote.getCurrentWindow()); + menu.popup({ window: remote.getCurrentWindow() }); } async savedCipher(cipher: CipherView) {