gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
zadam 2020-04-05 15:35:01 +02:00
parent 7bd05415fa
commit 8d312515dd
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/public/javascripts/services/tab_manager.js
View File

@ -204,7 +204,8 @@ export default class TabManager extends Component {
async activateOrOpenNote(noteId) { async activateOrOpenNote(noteId) {
for (const tabContext of this.getTabContexts()) { for (const tabContext of this.getTabContexts()) {
if (tabContext.note && tabContext.note.noteId === noteId) { if (tabContext.note && tabContext.note.noteId === noteId) {
await tabContext.activate(); this.activateTab(tabContext.tabId);
return; return;
} }
} }

4
src/routes/api/clipper.js
View File

@ -55,7 +55,9 @@ async function addClipping(req) {
const rewrittenContent = await addImagesToNote(images, clippingNote, content); const rewrittenContent = await addImagesToNote(images, clippingNote, content);
await clippingNote.setContent(await clippingNote.getContent() + '<p>' + rewrittenContent + '</p>'); const existingContent = await clippingNote.getContent();
await clippingNote.setContent(existingContent + (existingContent.trim() ? "<br/>" : "") + rewrittenContent);
return { return {
noteId: clippingNote.noteId noteId: clippingNote.noteId

4
src/services/notes.js
View File

@ -419,12 +419,14 @@ async function saveLinks(note, content) {
&& existingLink.name === foundLink.name); && existingLink.name === foundLink.name);
if (!existingLink) { if (!existingLink) {
await new Attribute({ const newLink = await new Attribute({
noteId: note.noteId, noteId: note.noteId,
type: foundLink.name === 'externalLink' ? 'label' : 'relation', type: foundLink.name === 'externalLink' ? 'label' : 'relation',
name: foundLink.name, name: foundLink.name,
value: foundLink.value, value: foundLink.value,
}).save(); }).save();
existingLinks.push(newLink);
} }
else if (existingLink.isDeleted) { else if (existingLink.isDeleted) {
existingLink.isDeleted = false; existingLink.isDeleted = false;