From f64f1b3bd9bec4036748b98ff8ac0f0431749f30 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Thu, 2 Dec 2021 23:57:13 +0100 Subject: chore: upgrade commitlint and eslint-plugin-unicorn to latest (#2295) - upgrade commitlint and eslint-plugin-unicorn dependencies - update prepare-code script to run lint:fix instead of lint - fix unicorn/no-await-expression-member lint issues - various whitespace formatting fixes due to lint:fix --- src/lib/Menu.js | 11 +++++++++-- src/lib/Tray.js | 11 ++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 892b2ff3c..8e529d859 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -1,5 +1,11 @@ import { clipboard } from 'electron'; -import { app, Menu, dialog, systemPreferences, getCurrentWindow } from '@electron/remote'; +import { + app, + Menu, + dialog, + systemPreferences, + getCurrentWindow, +} from '@electron/remote'; import { autorun, observable } from 'mobx'; import { defineMessages } from 'react-intl'; import { @@ -950,7 +956,8 @@ class FranzMenu { click: () => { this.actions.service.setActive({ serviceId: service.id }); - if (isMac && i === 0) { // feat(Mac): Open Window with Cmd+1 + if (isMac && i === 0) { + // feat(Mac): Open Window with Cmd+1 getCurrentWindow().restore(); } }, diff --git a/src/lib/Tray.js b/src/lib/Tray.js index 655dc416f..63382483e 100644 --- a/src/lib/Tray.js +++ b/src/lib/Tray.js @@ -33,15 +33,20 @@ export default class TrayIcon { mainWindow = null; - trayMenuTemplate = (tray) => [ + trayMenuTemplate = tray => [ { - label: (tray.mainWindow.isVisible() && tray.mainWindow.isFocused()) ? 'Hide Ferdi' : 'Show Ferdi', + label: + tray.mainWindow.isVisible() && tray.mainWindow.isFocused() + ? 'Hide Ferdi' + : 'Show Ferdi', click() { tray._toggleWindow(); }, }, { - label: tray.isAppMuted ? 'Enable Notifications && Audio' : 'Disable Notifications && Audio', + label: tray.isAppMuted + ? 'Enable Notifications && Audio' + : 'Disable Notifications && Audio', click() { if (!tray.mainWindow) return; tray.mainWindow.webContents.send('muteApp'); -- cgit v1.2.3-70-g09d2