From f404904a4948232d43ac9d787cbafe03555074d8 Mon Sep 17 00:00:00 2001 From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com> Date: Thu, 21 Jan 2021 17:58:38 -0600 Subject: [PATCH] Convert dock_icon.js to TypeScript --- app/dock_icon.js | 20 -------------------- app/tray_icon.js | 4 ++-- main.js | 4 ++-- ts/dock_icon.ts | 16 ++++++++++++++++ 4 files changed, 20 insertions(+), 24 deletions(-) delete mode 100644 app/dock_icon.js create mode 100644 ts/dock_icon.ts diff --git a/app/dock_icon.js b/app/dock_icon.js deleted file mode 100644 index 70b94aee95..0000000000 --- a/app/dock_icon.js +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2018-2020 Signal Messenger, LLC -// SPDX-License-Identifier: AGPL-3.0-only - -const { app } = require('electron'); - -const dockIcon = {}; - -dockIcon.show = () => { - if (process.platform === 'darwin') { - app.dock.show(); - } -}; - -dockIcon.hide = () => { - if (process.platform === 'darwin') { - app.dock.hide(); - } -}; - -module.exports = dockIcon; diff --git a/app/tray_icon.js b/app/tray_icon.js index cd44befe1b..8a88b4319b 100644 --- a/app/tray_icon.js +++ b/app/tray_icon.js @@ -1,11 +1,11 @@ -// Copyright 2017-2020 Signal Messenger, LLC +// Copyright 2017-2021 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only const path = require('path'); const fs = require('fs'); const { app, Menu, Tray } = require('electron'); -const dockIcon = require('./dock_icon'); +const dockIcon = require('../ts/dock_icon'); let trayContextMenu = null; let tray = null; diff --git a/main.js b/main.js index 259e46099e..c201908313 100644 --- a/main.js +++ b/main.js @@ -1,4 +1,4 @@ -// Copyright 2017-2020 Signal Messenger, LLC +// Copyright 2017-2021 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only /* eslint-disable no-console */ @@ -85,7 +85,7 @@ const attachmentChannel = require('./app/attachment_channel'); const bounce = require('./ts/services/bounce'); const updater = require('./ts/updater/index'); const createTrayIcon = require('./app/tray_icon'); -const dockIcon = require('./app/dock_icon'); +const dockIcon = require('./ts/dock_icon'); const ephemeralConfig = require('./app/ephemeral_config'); const logging = require('./app/logging'); const sql = require('./ts/sql/Server').default; diff --git a/ts/dock_icon.ts b/ts/dock_icon.ts new file mode 100644 index 0000000000..f649e9a57c --- /dev/null +++ b/ts/dock_icon.ts @@ -0,0 +1,16 @@ +// Copyright 2018-2021 Signal Messenger, LLC +// SPDX-License-Identifier: AGPL-3.0-only + +import { app } from 'electron'; + +export function show(): void { + if (process.platform === 'darwin') { + app.dock.show(); + } +} + +export function hide(): void { + if (process.platform === 'darwin') { + app.dock.hide(); + } +}