Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

removed CTRL-ALT-C global shortcut with pasting from clipboard, keeping only CTRL-ALT-P without clipboard

Browse Source
This commit is contained in:
azivner
2018-02-13 19:55:04 -05:00
parent 1efac99828
commit 1cef0ce5f9
2 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
electron.js
View File

@@ -70,34 +70,16 @@ app.on('activate', () => {
app.on('ready', () => { app.on('ready', () => {
mainWindow = createMainWindow(); mainWindow = createMainWindow();
const date_notes = require('./src/services/date_notes');
const utils = require('./src/services/utils');
globalShortcut.register('CommandOrControl+Alt+P', async () => { globalShortcut.register('CommandOrControl+Alt+P', async () => {
const date_notes = require('./src/services/date_notes');
const utils = require('./src/services/utils');
const parentNoteId = await date_notes.getDateNoteId(utils.nowDate()); const parentNoteId = await date_notes.getDateNoteId(utils.nowDate());
// window may be hidden / not in focus // window may be hidden / not in focus
mainWindow.focus(); mainWindow.focus();
mainWindow.webContents.send('create-sub-note', JSON.stringify({ mainWindow.webContents.send('create-day-sub-note', parentNoteId);
parentNoteId: parentNoteId,
content: ''
}));
});
globalShortcut.register('CommandOrControl+Alt+C', async () => {
const parentNoteId = await date_notes.getDateNoteId(utils.nowDate());
// window may be hidden / not in focus
mainWindow.focus();
let content = clipboard.readText();
content = content.replace(/(\r\n|\n)/g, "<p>");
mainWindow.webContents.send('create-sub-note', JSON.stringify({
parentNoteId: parentNoteId,
content: content
}));
}); });
}); });

7
src/public/javascripts/init.js
View File

@@ -199,9 +199,8 @@ $(document).ready(() => {
}); });
if (isElectron()) { if (isElectron()) {
require('electron').ipcRenderer.on('create-sub-note', async function(event, message) { require('electron').ipcRenderer.on('create-day-sub-note', async function(event, parentNoteId) {
const {parentNoteId, content} = JSON.parse(message); // this might occur when day note had to be created
if (!noteTree.noteExists(parentNoteId)) { if (!noteTree.noteExists(parentNoteId)) {
await noteTree.reload(); await noteTree.reload();
} }
@@ -211,7 +210,5 @@ if (isElectron()) {
const node = noteTree.getCurrentNode(); const node = noteTree.getCurrentNode();
await noteTree.createNote(node, node.data.noteId, 'into', node.data.isProtected); await noteTree.createNote(node, node.data.noteId, 'into', node.data.isProtected);
setTimeout(() => noteEditor.setContent(content), 1000);
}); });
} }