From 80d7ef19dbb4271416bd8b5bbf938e180c57e5f3 Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Wed, 12 May 2021 01:26:51 +0530 Subject: Method reuse (#1379) * Used already exported common functions to avoid the same logic being repeated. * Use a different package to retrieve the os-name for the 'About Dialog'. --- src/electron/ipc-api/appIndicator.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/electron/ipc-api/appIndicator.js') diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js index 70f14d95e..0691e5170 100644 --- a/src/electron/ipc-api/appIndicator.js +++ b/src/electron/ipc-api/appIndicator.js @@ -1,9 +1,10 @@ import { app, ipcMain } from 'electron'; import path from 'path'; import { autorun } from 'mobx'; +import { isMac, isWindows, isLinux } from '../../environment'; const INDICATOR_TASKBAR = 'taskbar'; -const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png'; +const FILE_EXTENSION = isWindows ? 'ico' : 'png'; let isTrayIconEnabled; @@ -28,29 +29,28 @@ export default (params) => { // Flash TaskBar for windows, bounce Dock on Mac if (!app.mainWindow.isFocused()) { if (params.settings.app.get('notifyTaskBarOnMessage')) { - if (process.platform === 'win32') { + if (isWindows) { app.mainWindow.flashFrame(true); app.mainWindow.once('focus', () => app.mainWindow.flashFrame(false)); - } else if (process.platform === 'darwin') { + } else if (isMac) { app.dock.bounce('informational'); } } } // Update badge - if (process.platform === 'darwin' + if (isMac && typeof (args.indicator) === 'string') { app.dock.setBadge(args.indicator); } - if ((process.platform === 'darwin' - || process.platform === 'linux') + if ((isMac || isLinux) && typeof (args.indicator) === 'number' ) { app.badgeCount = args.indicator; } - if (process.platform === 'win32') { + if (isWindows) { if (typeof args.indicator === 'number' && args.indicator !== 0) { params.mainWindow.setOverlayIcon( -- cgit v1.2.3-70-g09d2