#204 empty hotkeys won't trigger

CONTRIBUTING.md

@@ -37,6 +37,8 @@ npm link
 notion-enhancer apply -y
 ```
 
+to update the dev build, go into the downloaded folder and run `git pull`. (make sure any work-in-progress themes etc. are copied somewhere else safely first.)
+
 to remove the dev build, go into the downloaded folder and run:
 
 ```sh

mods/core/client.js

@@ -22,6 +22,7 @@ module.exports = (store, __exports) => {
     // additional hotkeys
     if (event.key === 'F5') location.reload();
     // open menu on hotkey toggle
+    if (store().menu_toggle) {
       const hotkey = toKeyEvent(store().menu_toggle);
       let triggered = true;
       for (let prop in hotkey)
@@ -31,11 +32,12 @@ module.exports = (store, __exports) => {
         )
           triggered = false;
       if (triggered) electron.ipcRenderer.send('enhancer:open-menu');
+    }
     if (tabsEnabled) {
+      const tabStore = () => store('e1692c29-475e-437b-b7ff-3eee872e1a42');
+      if (tabStore().select_modifier) {
         // switch between tabs via key modifier
-      const select_tab_modifier = toKeyEvent(
+        const select_tab_modifier = toKeyEvent(select_tab_modifier);
-        store('e1692c29-475e-437b-b7ff-3eee872e1a42').select_modifier
-      );
         let triggered = true;
         for (let prop in select_tab_modifier)
           if (select_tab_modifier[prop] !== event[prop]) triggered = false;
@@ -56,22 +58,23 @@ module.exports = (store, __exports) => {
           ].includes(event.key)
         )
           electron.ipcRenderer.sendToHost('enhancer:select-tab', event.key);
+      }
+      if (tabStore().new_tab) {
         // create/close tab keybindings
-      const new_tab_keybinding = toKeyEvent(
+        const new_tab_keybinding = toKeyEvent(tabStore().new_tab);
-        store('e1692c29-475e-437b-b7ff-3eee872e1a42').new_tab
+        let triggered = true;
-      );
-      triggered = true;
         for (let prop in new_tab_keybinding)
           if (new_tab_keybinding[prop] !== event[prop]) triggered = false;
         if (triggered) electron.ipcRenderer.sendToHost('enhancer:new-tab');
-      const close_tab_keybinding = toKeyEvent(
+      }
-        store('e1692c29-475e-437b-b7ff-3eee872e1a42').close_tab
+      if (tabStore().close_tab) {
-      );
+        const close_tab_keybinding = toKeyEvent(tabStore().close_tab);
-      triggered = true;
+        let triggered = true;
         for (let prop in close_tab_keybinding)
           if (close_tab_keybinding[prop] !== event[prop]) triggered = false;
         if (triggered) electron.ipcRenderer.sendToHost('enhancer:close-tab');
       }
+    }
   });
 
   const attempt_interval = setInterval(enhance, 500);

mods/core/enhancerMenu.js

@@ -145,6 +145,7 @@ window['__start'] = async () => {
     )
       $popup.classList.remove('visible');
     // close window on hotkey toggle
+    if (coreStore().menu_toggle) {
       const hotkey = toKeyEvent(coreStore().menu_toggle);
       let triggered = true;
       for (let prop in hotkey)
@@ -155,6 +156,7 @@ window['__start'] = async () => {
           triggered = false;
       if (triggered || ((event.ctrlKey || event.metaKey) && event.key === 'w'))
         electron.remote.getCurrentWindow().close();
+    }
     //  focus search
     const meta =
       !(event.ctrlKey || event.metaKey) && !event.altKey && !event.shiftKey;

mods/core/render.js

@@ -1010,19 +1010,6 @@ module.exports = (store, __exports) => {
         document.body.className = `notion-${theme}-theme`;
       });
 
-      // open menu on hotkey toggle
-      document.addEventListener('keyup', (event) => {
-        const hotkey = toKeyEvent(store().menu_toggle);
-        let triggered = true;
-        for (let prop in hotkey)
-          if (
-            hotkey[prop] !== event[prop] &&
-            !(prop === 'key' && event[prop] === 'Dead')
-          )
-            triggered = false;
-        if (triggered) electron.ipcRenderer.send('enhancer:open-menu');
-      });
-
       const parsed = url.parse(window.location.href, true),
         notionUrl =
           parsed.query.path ||

mods/core/tray.js

@@ -246,11 +246,13 @@ module.exports = (store, __exports) => {
       else showWindows(windows);
     }
     tray.on('click', toggleWindows);
+    if (store().hotkey) {
       electron.globalShortcut.register(store().hotkey, () => {
         const windows = getAllWindows();
         if (windows.some((win) => win.isFocused() && win.isVisible()))
           hideWindows(windows);
         else showWindows(windows);
       });
+    }
   });
 };