bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 08:43:33 +00:00
Code Issues Releases Wiki Activity

update to electron 6

Browse Source
This commit is contained in:
Kyle Spearrin
2020-01-27 09:46:50 -05:00
parent f975323175
commit c344c5c13d
4 changed files with 865 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/menu.main.ts
View File

@@ -90,7 +90,7 @@ export class MenuMain extends BaseMenu {
label: this.main.i18nService.t('changeMasterPass'),
id: 'changeMasterPass',
click: async () => {
const result = dialog.showMessageBox(this.main.windowMain.win, {
const result = await dialog.showMessageBox(this.main.windowMain.win, {
title: this.main.i18nService.t('changeMasterPass'),
message: this.main.i18nService.t('changeMasterPass'),
detail: this.main.i18nService.t('changeMasterPasswordConfirmation'),
@@ -99,7 +99,7 @@ export class MenuMain extends BaseMenu {
defaultId: 0,
noLink: true,
});
if (result === 0) {
if (result.response === 0) {
await this.openWebVault();
}
},
@@ -108,7 +108,7 @@ export class MenuMain extends BaseMenu {
label: this.main.i18nService.t('twoStepLogin'),
id: 'twoStepLogin',
click: async () => {
const result = dialog.showMessageBox(this.main.windowMain.win, {
const result = await dialog.showMessageBox(this.main.windowMain.win, {
title: this.main.i18nService.t('twoStepLogin'),
message: this.main.i18nService.t('twoStepLogin'),
detail: this.main.i18nService.t('twoStepLoginConfirmation'),
@@ -117,7 +117,7 @@ export class MenuMain extends BaseMenu {
defaultId: 0,
noLink: true,
});
if (result === 0) {
if (result.response === 0) {
await this.openWebVault();
}
},
@@ -131,8 +131,8 @@ export class MenuMain extends BaseMenu {
{
label: this.i18nService.t('logOut'),
id: 'logOut',
click: () => {
const result = dialog.showMessageBox(this.windowMain.win, {
click: async () => {
const result = await dialog.showMessageBox(this.windowMain.win, {
title: this.i18nService.t('logOut'),
message: this.i18nService.t('logOut'),
detail: this.i18nService.t('logOutConfirmation'),
@@ -141,7 +141,7 @@ export class MenuMain extends BaseMenu {
defaultId: 0,
noLink: true,
});
if (result === 0) {
if (result.response === 0) {
this.main.messagingService.send('logout');
}
},
@@ -431,13 +431,13 @@ export class MenuMain extends BaseMenu {
aboutMenuAdditions.push({
label: this.i18nService.t('aboutBitwarden'),
click: () => {
click: async () => {
const aboutInformation = this.i18nService.t('version', app.getVersion()) +
'\nShell ' + process.versions.electron +
'\nRenderer ' + process.versions.chrome +
'\nNode ' + process.versions.node +
'\nArchitecture ' + process.arch;
const result = dialog.showMessageBox(this.windowMain.win, {
const result = await dialog.showMessageBox(this.windowMain.win, {
title: 'Bitwarden',
message: 'Bitwarden',
detail: aboutInformation,
@@ -445,7 +445,7 @@ export class MenuMain extends BaseMenu {
noLink: true,
buttons: [this.i18nService.t('ok'), this.i18nService.t('copy')],
});
if (result === 1) {
if (result.response === 1) {
clipboard.writeText(aboutInformation);
}
},