From 5aa6f8ecf47fc2d2d3ae586ec6269c3b0f4921ac Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 3 Jun 2019 08:37:05 -0400 Subject: [PATCH] cleanup --- jslib | 2 +- src/locales/en/messages.json | 2 +- src/main/menu.main.ts | 25 ++++++++++++------------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/jslib b/jslib index 18d267933b..3d93696fb5 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 18d267933bbf02475e39e6c47c1bc59f3873dfe9 +Subproject commit 3d93696fb51b6a0c3d29c6df626e60fab9cca789 diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index 1f031fbf08..587ccdc972 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -1145,7 +1145,7 @@ }, "alwaysOnTop": { "message": "Always on Top", - "description": "Bitwarden window should always stay on top of other windows" + "description": "Application indow should always stay on top of other windows" }, "dateUpdated": { "message": "Updated", diff --git a/src/main/menu.main.ts b/src/main/menu.main.ts index f9b83d04cc..9dc0509441 100644 --- a/src/main/menu.main.ts +++ b/src/main/menu.main.ts @@ -442,19 +442,18 @@ export class MenuMain extends BaseMenu { } (template[template.length - 2].submenu as MenuItemConstructorOptions[]).splice(1, 0, - { - label: this.main.i18nService.t(process.platform === 'darwin' ? 'hideToMenuBar' : 'hideToTray'), - click: () => this.main.messagingService.send('hideToTray'), - accelerator: 'CmdOrCtrl+Shift+M', - }, - { - type: 'checkbox', - label: this.main.i18nService.t('alwaysOnTop'), - checked: this.windowMain.win.isAlwaysOnTop(), - click: () => this.main.windowMain.toggleAlwaysOnTop(), - accelerator: 'CmdOrCtrl+Shift+T', - }, - ); + { + label: this.main.i18nService.t(process.platform === 'darwin' ? 'hideToMenuBar' : 'hideToTray'), + click: () => this.main.messagingService.send('hideToTray'), + accelerator: 'CmdOrCtrl+Shift+M', + }, + { + type: 'checkbox', + label: this.main.i18nService.t('alwaysOnTop'), + checked: this.windowMain.win.isAlwaysOnTop(), + click: () => this.main.windowMain.toggleAlwaysOnTop(), + accelerator: 'CmdOrCtrl+Shift+T', + }); this.menu = Menu.buildFromTemplate(template); Menu.setApplicationMenu(this.menu); }