diff --git a/ElectronClient/ElectronAppWrapper.js b/ElectronClient/ElectronAppWrapper.js index b7c5203d3..08cd1f52c 100644 --- a/ElectronClient/ElectronAppWrapper.js +++ b/ElectronClient/ElectronAppWrapper.js @@ -1,4 +1,4 @@ -const { BrowserWindow, Tray, screen, globalShortcut } = require('electron'); +const { BrowserWindow, Tray, screen } = require('electron'); const { shim } = require('lib/shim'); const url = require('url'); const path = require('path'); @@ -277,15 +277,6 @@ class ElectronAppWrapper { return false; } - toggleWindowVisilibity() { - if (this.win_.isVisible()) { - this.win_.hide(); - } else { - this.win_.setVisibleOnAllWorkspaces(true); - this.win_.show(); - } - } - async start() { // Since we are doing other async things before creating the window, we might miss // the "ready" event. So we use the function below to make sure that the app is ready. @@ -296,17 +287,8 @@ class ElectronAppWrapper { this.createWindow(); - const registerGlobalShortcut = globalShortcut.register('CommandOrControl+Alt+J', () => { - this.toggleWindowVisilibity(); - }); - - if (!registerGlobalShortcut) { - console.warn('Could not register global shortcut'); - } - this.electronApp_.on('before-quit', () => { this.willQuitApp_ = true; - globalShortcut.unregisterAll(); }); this.electronApp_.on('window-all-closed', () => { diff --git a/README.md b/README.md index 0dd41007f..f785526a3 100644 --- a/README.md +++ b/README.md @@ -303,10 +303,6 @@ Notes are sorted by "relevance". Currently it means the notes that contain the r In the desktop application, press Ctrl+G or Cmd+G and type a note title or part of its content to jump to it. Or type # followed by a tag name, or @ followed by a notebook name. -# Global shortcut - -In the desktop application, press `Cmd+Opt+J` (macOS) or `Ctrl+Alt+J` (Linux, Windows) to show or hide Joplin in the current workspace. - # Privacy Joplin values your privacy and security by giving you complete control over your information and digital footprint.