dragonwocky/notion-enhancer
1
0
Fork 0
mirror of https://github.com/notion-enhancer/notion-enhancer.git synced 2025-04-07 22:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove extension menu hotkey conflict + make configurable

Browse Source
This commit is contained in:
dragonwocky 2020-09-02 20:40:35 +10:00
parent 0355c7d344
commit 513b5f4cab
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repo/core/client.js
View File

@ -19,8 +19,6 @@ module.exports = (store, __exports) => {
// additional hotkeys // additional hotkeys
document.defaultView.addEventListener('keyup', (event) => { document.defaultView.addEventListener('keyup', (event) => {
if (event.code === 'F5') location.reload(); if (event.code === 'F5') location.reload();
if (event.key === 'e' && (event.ctrlKey || event.metaKey))
electron.ipcRenderer.send('enhancer:open-extension-menu');
}); });
const attempt_interval = setInterval(enhance, 500); const attempt_interval = setInterval(enhance, 500);

5
repo/core/menu.js
View File

@ -19,7 +19,6 @@ window['__start'] = async () => {
document.defaultView.addEventListener('keyup', (event) => { document.defaultView.addEventListener('keyup', (event) => {
if (event.code === 'F5') location.reload(); if (event.code === 'F5') location.reload();
if ((event.ctrlKey || event.metaKey) && event.key === 'e') browser.close();
if (!(event.ctrlKey || event.metaKey) && !event.altKey && !event.shiftKey) { if (!(event.ctrlKey || event.metaKey) && !event.altKey && !event.shiftKey) {
if ( if (
document.activeElement.parentElement.id === 'tags' && document.activeElement.parentElement.id === 'tags' &&
@ -458,6 +457,7 @@ window['__start'] = async () => {
$opt $opt
.querySelector(`#${opt.type}_${mod.id}--${opt.key}`) .querySelector(`#${opt.type}_${mod.id}--${opt.key}`)
.addEventListener('change', (event) => { .addEventListener('change', (event) => {
modified();
if (opt.type === 'toggle') { if (opt.type === 'toggle') {
store(mod.id)[opt.key] = event.target.checked; store(mod.id)[opt.key] = event.target.checked;
} else if (opt.type === 'file') { } else if (opt.type === 'file') {
@ -469,9 +469,8 @@ window['__start'] = async () => {
} else } else
store(mod.id)[opt.key] = store(mod.id)[opt.key] =
typeof opt.value === 'number' typeof opt.value === 'number'
? Number(event.target.value) ? +event.target.value
: event.target.value; : event.target.value;
modified();
}); });
} }
$options.appendChild($opt); $options.appendChild($opt);

6
repo/core/mod.js
View File

@ -56,6 +56,12 @@ module.exports = {
type: 'input', type: 'input',
value: 'CommandOrControl+Shift+A', value: 'CommandOrControl+Shift+A',
}, },
{
key: 'menu_toggle',
label: 'open enhancements menu hotkey:',
type: 'input',
value: 'Alt+E',
},
], ],
hacks: { hacks: {
'main/main.js': require('./tray.js'), 'main/main.js': require('./tray.js'),

14
repo/core/tray.js
View File

@ -40,7 +40,6 @@ module.exports = (store, __exports) => {
webContents.send('enhancer:get-theme-vars', arg) webContents.send('enhancer:get-theme-vars', arg)
); );
}); });
electron.ipcMain.on('enhancer:open-extension-menu', openExtensionMenu);
function calculateWindowPos(width, height) { function calculateWindowPos(width, height) {
const screen = electron.screen.getDisplayNearestPoint({ const screen = electron.screen.getDisplayNearestPoint({
@ -157,7 +156,7 @@ module.exports = (store, __exports) => {
{ {
type: 'normal', type: 'normal',
label: 'Enhancements', label: 'Enhancements',
accelerator: 'CommandOrControl+E', accelerator: store().menu_toggle,
click: openExtensionMenu, click: openExtensionMenu,
}, },
{ {
@ -193,6 +192,17 @@ module.exports = (store, __exports) => {
tray.setContextMenu(contextMenu); tray.setContextMenu(contextMenu);
tray.setToolTip('Notion'); tray.setToolTip('Notion');
electron.globalShortcut.register(store().menu_toggle, () => {
if (
electron.BrowserWindow.getAllWindows()
.filter((win) => win.getTitle() !== 'notion-enhancer menu')
.some((win) => win.isFocused())
) {
openExtensionMenu();
} else if (enhancer_menu && enhancer_menu.isFocused())
enhancer_menu.close();
});
function showWindows() { function showWindows() {
const windows = electron.BrowserWindow.getAllWindows(); const windows = electron.BrowserWindow.getAllWindows();
if (is_mac) electron.app.show(); if (is_mac) electron.app.show();

2
repo/weekly-view/mod.js
View File

@ -46,7 +46,7 @@ module.exports = {
: 0; : 0;
for (let day of days) for (let day of days)
day.parentElement.parentElement.style.height = 0; day.parentElement.parentElement.style.height = 0;
today.parentElement.parentElement.style.height = height; if (today) today.parentElement.parentElement.style.height = height;
} }
} }
}); });