mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
opening links from the clipper
This commit is contained in:
parent
ec87856ef4
commit
f45e25172b
@ -707,6 +707,18 @@ messagingService.subscribeToMessages(message => {
|
|||||||
if (message.type === 'refresh-tree') {
|
if (message.type === 'refresh-tree') {
|
||||||
reload();
|
reload();
|
||||||
}
|
}
|
||||||
|
else if (message.type === 'open-note') {
|
||||||
|
noteDetailService.loadNoteDetail(message.noteId, {
|
||||||
|
newTab: true,
|
||||||
|
activate: true
|
||||||
|
});
|
||||||
|
|
||||||
|
if (utils.isElectron()) {
|
||||||
|
const currentWindow = require("electron").remote.getCurrentWindow();
|
||||||
|
|
||||||
|
currentWindow.show();
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
messagingService.subscribeToSyncMessages(syncData => {
|
messagingService.subscribeToSyncMessages(syncData => {
|
||||||
|
@ -4,6 +4,7 @@ const noteService = require('../../services/notes');
|
|||||||
const dateNoteService = require('../../services/date_notes');
|
const dateNoteService = require('../../services/date_notes');
|
||||||
const dateUtils = require('../../services/date_utils');
|
const dateUtils = require('../../services/date_utils');
|
||||||
const imageService = require('../../services/image');
|
const imageService = require('../../services/image');
|
||||||
|
const messagingService = require('../../services/messaging');
|
||||||
const log = require('../../services/log');
|
const log = require('../../services/log');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const Link = require('../../entities/link');
|
const Link = require('../../entities/link');
|
||||||
@ -52,7 +53,9 @@ async function createNote(req) {
|
|||||||
|
|
||||||
await note.setContent(rewrittenHtml);
|
await note.setContent(rewrittenHtml);
|
||||||
|
|
||||||
return {};
|
return {
|
||||||
|
noteId: note.noteId
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async function createImage(req) {
|
async function createImage(req) {
|
||||||
@ -92,7 +95,16 @@ async function createImage(req) {
|
|||||||
await note.setLabel('pageUrl', pageUrl);
|
await note.setLabel('pageUrl', pageUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
return {};
|
return {
|
||||||
|
noteId: note.noteId
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openNote(req) {
|
||||||
|
messagingService.sendMessageToAllClients({
|
||||||
|
type: 'open-note',
|
||||||
|
noteId: req.params.noteId
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function ping(req, res) {
|
async function ping(req, res) {
|
||||||
@ -104,5 +116,6 @@ async function ping(req, res) {
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
createNote,
|
createNote,
|
||||||
createImage,
|
createImage,
|
||||||
|
openNote,
|
||||||
ping
|
ping
|
||||||
};
|
};
|
@ -226,6 +226,7 @@ function register(app) {
|
|||||||
|
|
||||||
route(POST, '/api/clipper/notes', [], clipperRoute.createNote, apiResultHandler);
|
route(POST, '/api/clipper/notes', [], clipperRoute.createNote, apiResultHandler);
|
||||||
route(POST, '/api/clipper/image', [], clipperRoute.createImage, apiResultHandler);
|
route(POST, '/api/clipper/image', [], clipperRoute.createImage, apiResultHandler);
|
||||||
|
route(POST, '/api/clipper/open/:noteId', [], clipperRoute.openNote, apiResultHandler);
|
||||||
route(GET, '/api/clipper/ping', [], clipperRoute.ping);
|
route(GET, '/api/clipper/ping', [], clipperRoute.ping);
|
||||||
|
|
||||||
app.use('', router);
|
app.use('', router);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user