TagSpaces is an offline, open source, document manager with tagging support
Fix event listener warning in dev console (#2158)
Stanimir4019c3aaab22
diff --git a/src/main/main.ts b/src/main/main.tsindex 7b671897e..d13f72ef6 100644--- a/src/main/main.ts+++ b/src/main/main.ts@@ -160,7 +160,7 @@ function getSpellcheckLanguage(i18n) {}function showApp() {- var windows = BrowserWindow.getAllWindows();+ const windows = BrowserWindow.getAllWindows();windows.forEach((win, i) => {if (win && i < 1) {if (win.isMinimized()) {@@ -188,87 +188,87 @@ function showMainWindow() {}function openLocationManagerPanel() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'open-location-manager-panel');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('panels', 'open-location-manager-panel');}function openTagLibraryPanel() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'open-tag-library-panel');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('panels', 'open-tag-library-panel');+}++function openHelpFeedbackPanel() {+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('panels', 'open-help-feedback-panel');}function goBack() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'go-back');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('opened-entry', 'go-back');}function goForward() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'go-forward');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('opened-entry', 'go-forward');}function setZoomResetApp() {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();focusedWindow?.webContents.send('cmd', 'set-zoom-reset-app');}function setZoomInApp() {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();focusedWindow?.webContents.send('cmd', 'set-zoom-in-app');}function setZoomOutApp() {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();focusedWindow?.webContents.send('cmd', 'set-zoom-out-app');}function exitFullscreen() {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();focusedWindow?.webContents.send('cmd', 'exit-fullscreen');}function toggleSettingsDialog() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'toggle-settings-dialog');-}--function openHelpFeedbackPanel() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'open-help-feedback-panel');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('toggle-settings-dialog');}function toggleKeysDialog() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'toggle-keys-dialog');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('toggle-keys-dialog');}function toggleOnboardingDialog() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'toggle-onboarding-dialog');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('toggle-onboarding-dialog');}function openURLExternally(data) {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();focusedWindow?.webContents.send('open-url-externally', data);}function toggleLicenseDialog() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'toggle-license-dialog');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('toggle-license-dialog');}function toggleThirdPartyLibsDialog() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'toggle-third-party-libs-dialog');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('toggle-third-party-libs-dialog');}function toggleAboutDialog() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'toggle-about-dialog');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('toggle-about-dialog');}function showSearch() {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();if (focusedWindow) {focusedWindow?.webContents.send('cmd', 'open-search');} else {@@ -278,60 +278,54 @@ function showSearch() {}function newTextFile() {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();if (focusedWindow) {- focusedWindow?.webContents.send('cmd', 'new-text-file');+ focusedWindow?.webContents.send('new-text-file');} else {showMainWindow();- mainWindow?.webContents.send('cmd', 'new-text-file');+ mainWindow?.webContents.send('new-text-file');}}function getNextFile() {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();if (focusedWindow) {- focusedWindow?.webContents.send('cmd', 'next-file');+ focusedWindow?.webContents.send('perspective', 'next-file');} else {showMainWindow();- mainWindow?.webContents.send('cmd', 'next-file');+ mainWindow?.webContents.send('perspective', 'next-file');}}function getPreviousFile() {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();if (focusedWindow) {- focusedWindow?.webContents.send('cmd', 'previous-file');+ focusedWindow?.webContents.send('perspective', 'previous-file');} else {showMainWindow();- mainWindow?.webContents.send('cmd', 'previous-file');+ mainWindow?.webContents.send('perspective', 'previous-file');}}function showCreateDirectoryDialog() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'show-create-directory-dialog');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('show-create-directory-dialog');}function toggleOpenLinkDialog() {- var focusedWindow = BrowserWindow.getFocusedWindow();- focusedWindow?.webContents.send('cmd', 'toggle-open-link-dialog');+ const focusedWindow = BrowserWindow.getFocusedWindow();+ focusedWindow?.webContents.send('toggle-open-link-dialog');}function resumePlayback() {- // var focusedWindow = BrowserWindow.getFocusedWindow();- // if (focusedWindow) {- // focusedWindow?.webContents.send('cmd', 'play-pause');- // } else {- // mainWindow?.webContents.send('cmd', 'play-pause');- // }- var windows = BrowserWindow.getAllWindows();+ const windows = BrowserWindow.getAllWindows();windows.forEach((win, i) => {- win?.webContents.send('cmd', 'play-pause');+ win?.webContents.send('play-pause');});}function reloadApp() {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();focusedWindow?.loadURL(resolveHtmlPath('index.html'));}@@ -656,7 +650,7 @@ app.on('window-all-closed', () => {app.on('activate', (event, hasVisibleWindows) => {// console.log('Activate ' + hasVisibleWindows);- var windows = BrowserWindow.getAllWindows();+ const windows = BrowserWindow.getAllWindows();// On macOS it's common to re-create a window in the app when the// dock icon is clicked and there are no other windows open.if (windows.length === 0) {@@ -788,7 +782,7 @@ app});ipcMain.on('setZoomFactor', (event, zoomLevel) => {- var focusedWindow = BrowserWindow.getFocusedWindow();+ const focusedWindow = BrowserWindow.getFocusedWindow();focusedWindow?.webContents.setZoomFactor(zoomLevel);});diff --git a/src/main/preload.ts b/src/main/preload.tsindex b3524634f..363613170 100644--- a/src/main/preload.ts+++ b/src/main/preload.ts@@ -51,6 +51,18 @@ export type Channels =| 'set_extensions'| 'play-pause'| 'cmd'+ | 'toggle-about-dialog'+ | 'show-create-directory-dialog'+ | 'toggle-keys-dialog'+ | 'toggle-license-dialog'+ | 'toggle-open-link-dialog'+ | 'new-text-file'+ | 'toggle-onboarding-dialog'+ | 'toggle-settings-dialog'+ | 'toggle-third-party-libs-dialog'+ | 'perspective'+ | 'panels'+ | 'opened-entry'| 'progress'| 'uploadAbort';diff --git a/src/renderer/components/FileView.tsx b/src/renderer/components/FileView.tsxindex 563d24670..3652b9a9c 100644--- a/src/renderer/components/FileView.tsx+++ b/src/renderer/components/FileView.tsx@@ -54,16 +54,14 @@ function FileView(props: Props) {useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {- if (arg === 'play-pause') {- // @ts-ignore- fileViewer?.current?.contentWindow?.togglePlay();- }+ window.electronIO.ipcRenderer.on('play-pause', () => {+ // @ts-ignore+ fileViewer?.current?.contentWindow?.togglePlay();});return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners('play-pause');}};}diff --git a/src/renderer/components/dialogs/hooks/AboutDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/AboutDialogContextProvider.tsxindex d6133981d..74c8fa19b 100644--- a/src/renderer/components/dialogs/hooks/AboutDialogContextProvider.tsx+++ b/src/renderer/components/dialogs/hooks/AboutDialogContextProvider.tsx@@ -53,15 +53,15 @@ export const AboutDialogContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {- if (arg === 'toggle-about-dialog') {- openDialog();- }+ window.electronIO.ipcRenderer.on('toggle-about-dialog', () => {+ openDialog();});return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners(+ 'toggle-about-dialog',+ );}};}diff --git a/src/renderer/components/dialogs/hooks/CreateDirectoryDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/CreateDirectoryDialogContextProvider.tsxindex 1f7b40c3c..55d1d1e17 100644--- a/src/renderer/components/dialogs/hooks/CreateDirectoryDialogContextProvider.tsx+++ b/src/renderer/components/dialogs/hooks/CreateDirectoryDialogContextProvider.tsx@@ -62,17 +62,17 @@ export const CreateDirectoryDialogContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {- if (arg === 'show-create-directory-dialog') {- openDialog(undefined, (dirPath) => {- console.log(dirPath);- });- }+ window.electronIO.ipcRenderer.on('show-create-directory-dialog', () => {+ openDialog(undefined, (dirPath) => {+ console.log(dirPath);+ });});return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners(+ 'show-create-directory-dialog',+ );}};}diff --git a/src/renderer/components/dialogs/hooks/KeyboardDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/KeyboardDialogContextProvider.tsxindex c157b7e94..bd4fb8847 100644--- a/src/renderer/components/dialogs/hooks/KeyboardDialogContextProvider.tsx+++ b/src/renderer/components/dialogs/hooks/KeyboardDialogContextProvider.tsx@@ -53,15 +53,15 @@ export const KeyboardDialogContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {- if (arg === 'toggle-keys-dialog') {- openDialog();- }+ window.electronIO.ipcRenderer.on('toggle-keys-dialog', (arg) => {+ openDialog();});return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners(+ 'toggle-keys-dialog',+ );}};}diff --git a/src/renderer/components/dialogs/hooks/LicenseDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/LicenseDialogContextProvider.tsxindex 34b9b01bc..96232a393 100644--- a/src/renderer/components/dialogs/hooks/LicenseDialogContextProvider.tsx+++ b/src/renderer/components/dialogs/hooks/LicenseDialogContextProvider.tsx@@ -58,15 +58,15 @@ export const LicenseDialogContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {- if (arg === 'toggle-license-dialog') {- openDialog();- }+ window.electronIO.ipcRenderer.on('toggle-license-dialog', () => {+ openDialog();});return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners(+ 'toggle-license-dialog',+ );}};}diff --git a/src/renderer/components/dialogs/hooks/LinkDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/LinkDialogContextProvider.tsxindex 79b32dbbf..7f55efcff 100644--- a/src/renderer/components/dialogs/hooks/LinkDialogContextProvider.tsx+++ b/src/renderer/components/dialogs/hooks/LinkDialogContextProvider.tsx@@ -53,15 +53,15 @@ export const LinkDialogContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {- if (arg === 'toggle-open-link-dialog') {- openDialog();- }+ window.electronIO.ipcRenderer.on('toggle-open-link-dialog', () => {+ openDialog();});return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners(+ 'toggle-open-link-dialog',+ );}};}diff --git a/src/renderer/components/dialogs/hooks/NewFileDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/NewFileDialogContextProvider.tsxindex cfe7f7ca6..3c924c81e 100644--- a/src/renderer/components/dialogs/hooks/NewFileDialogContextProvider.tsx+++ b/src/renderer/components/dialogs/hooks/NewFileDialogContextProvider.tsx@@ -54,15 +54,13 @@ export const NewFileDialogContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {- if (arg === 'new-text-file') {- openDialog();- }+ window.electronIO.ipcRenderer.on('new-text-file', () => {+ openDialog();});return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners('new-text-file');}};}diff --git a/src/renderer/components/dialogs/hooks/OnboardingDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/OnboardingDialogContextProvider.tsxindex b8c3fa2ca..f7a3c181c 100644--- a/src/renderer/components/dialogs/hooks/OnboardingDialogContextProvider.tsx+++ b/src/renderer/components/dialogs/hooks/OnboardingDialogContextProvider.tsx@@ -58,15 +58,15 @@ export const OnboardingDialogContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {- if (arg === 'toggle-onboarding-dialog') {- openDialog();- }+ window.electronIO.ipcRenderer.on('toggle-onboarding-dialog', () => {+ openDialog();});return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners(+ 'toggle-onboarding-dialog',+ );}};}diff --git a/src/renderer/components/dialogs/hooks/SettingsDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/SettingsDialogContextProvider.tsxindex f36e64e5e..cfbf1eeaa 100644--- a/src/renderer/components/dialogs/hooks/SettingsDialogContextProvider.tsx+++ b/src/renderer/components/dialogs/hooks/SettingsDialogContextProvider.tsx@@ -56,15 +56,15 @@ export const SettingsDialogContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {- if (arg === 'toggle-settings-dialog') {- openDialog();- }+ window.electronIO.ipcRenderer.on('toggle-settings-dialog', () => {+ openDialog();});return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners(+ 'toggle-settings-dialog',+ );}};}diff --git a/src/renderer/components/dialogs/hooks/ThirdPartyLibsDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/ThirdPartyLibsDialogContextProvider.tsxindex 6505f0faa..a52799872 100644--- a/src/renderer/components/dialogs/hooks/ThirdPartyLibsDialogContextProvider.tsx+++ b/src/renderer/components/dialogs/hooks/ThirdPartyLibsDialogContextProvider.tsx@@ -57,15 +57,18 @@ export const ThirdPartyLibsDialogContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {- if (arg === 'toggle-third-party-libs-dialog') {+ window.electronIO.ipcRenderer.on(+ 'toggle-third-party-libs-dialog',+ (arg) => {openDialog();- }- });+ },+ );return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners(+ 'toggle-third-party-libs-dialog',+ );}};}diff --git a/src/renderer/hooks/OpenedEntryContextProvider.tsx b/src/renderer/hooks/OpenedEntryContextProvider.tsxindex 6889beb88..39f3c2526 100644--- a/src/renderer/hooks/OpenedEntryContextProvider.tsx+++ b/src/renderer/hooks/OpenedEntryContextProvider.tsx@@ -194,7 +194,7 @@ export const OpenedEntryContextProvider = ({}}if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {+ window.electronIO.ipcRenderer.on('opened-entry', (arg) => {if (arg === 'go-back') {goBack();} else if (arg === 'go-forward') {@@ -204,7 +204,7 @@ export const OpenedEntryContextProvider = ({return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners('opened-entry');}};}diff --git a/src/renderer/hooks/PanelsContextProvider.tsx b/src/renderer/hooks/PanelsContextProvider.tsxindex b9e25bd60..aeb5b9d92 100644--- a/src/renderer/hooks/PanelsContextProvider.tsx+++ b/src/renderer/hooks/PanelsContextProvider.tsx@@ -46,7 +46,7 @@ export const PanelsContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {+ window.electronIO.ipcRenderer.on('panels', (arg) => {if (arg === 'open-location-manager-panel') {showPanel('locationManagerPanel');} else if (arg === 'open-tag-library-panel') {@@ -58,7 +58,7 @@ export const PanelsContextProvider = ({return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners('panels');}};}diff --git a/src/renderer/hooks/PerspectiveActionsContextProvider.tsx b/src/renderer/hooks/PerspectiveActionsContextProvider.tsxindex 60ed4a26e..d49aafb56 100644--- a/src/renderer/hooks/PerspectiveActionsContextProvider.tsx+++ b/src/renderer/hooks/PerspectiveActionsContextProvider.tsx@@ -51,7 +51,7 @@ export const PerspectiveActionsContextProvider = ({useEffect(() => {if (AppConfig.isElectron) {- window.electronIO.ipcRenderer.on('cmd', (arg) => {+ window.electronIO.ipcRenderer.on('perspective', (arg) => {if (arg === 'next-file') {const action: TS.PerspectiveActions = {action: 'openNext',@@ -67,7 +67,7 @@ export const PerspectiveActionsContextProvider = ({return () => {if (window.electronIO.ipcRenderer) {- window.electronIO.ipcRenderer.removeAllListeners('cmd');+ window.electronIO.ipcRenderer.removeAllListeners('perspective');}};}