sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/255/head
azivner 2018-02-13 19:55:04 +07:00
parent 1efac99828
commit 1cef0ce5f9
2 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
electron.js
Unescape Escape View File

@ -70,34 +70,16 @@ app.on('activate', () => {
app.on('ready', () => {
mainWindow = createMainWindow();
globalShortcut.register('CommandOrControl+Alt+P', async () => {
const date_notes = require('./src/services/date_notes');
const utils = require('./src/services/utils');
globalShortcut.register('CommandOrControl+Alt+P', async () => {
const parentNoteId = await date_notes.getDateNoteId(utils.nowDate());
// window may be hidden / not in focus
mainWindow.focus();
mainWindow.webContents.send('create-sub-note', JSON.stringify({
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
}));
mainWindow.webContents.send('create-day-sub-note', parentNoteId);
});
});

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

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