Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-18 03:00:41 +01:00
Code Issues Packages Projects Releases Activity

use relations to pick note to render, fixes #141

Browse Source
This commit is contained in:
azivner
2018-08-28 20:55:21 +02:00
parent 9cfa2ab1ba
commit 7ae2a24770
6 changed files with 61 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/public/javascripts/services/note_detail.js
View File

@@ -38,6 +38,8 @@ let noteChangeDisabled = false;
let isNoteChanged = false;
let attributePromise;
const components = {
'code': noteDetailCode,
'text': noteDetailText,
@@ -147,6 +149,7 @@ async function handleProtectedSession() {
async function loadNoteDetail(noteId) {
currentNote = await loadNote(noteId);
refreshAttributes(); // needs to happend after loading the note itself because it references current noteId
if (isNewNoteCreated) {
isNewNoteCreated = false;
@@ -191,13 +194,15 @@ async function loadNoteDetail(noteId) {
await bundleService.executeRelationBundles(getCurrentNote(), 'runOnNoteView');
const attributes = await loadAttributes();
await showAttributes();
const hideChildrenOverview = attributes.some(attr => attr.type === 'label' && attr.name === 'hideChildrenOverview');
await showChildrenOverview(hideChildrenOverview);
await showChildrenOverview();
}
async function showChildrenOverview(hideChildrenOverview) {
async function showChildrenOverview() {
const attributes = await attributePromise;
const hideChildrenOverview = attributes.some(attr => attr.type === 'label' && attr.name === 'hideChildrenOverview');
if (hideChildrenOverview) {
$childrenOverview.hide();
return;
@@ -222,13 +227,23 @@ async function showChildrenOverview(hideChildrenOverview) {
$childrenOverview.show();
}
async function loadAttributes() {
async function refreshAttributes() {
attributePromise = server.get('notes/' + getCurrentNoteId() + '/attributes');
await showAttributes();
}
async function getAttributes() {
return await attributePromise;
}
async function showAttributes() {
$promotedAttributesContainer.empty();
$attributeList.hide();
const noteId = getCurrentNoteId();
const attributes = await server.get('notes/' + noteId + '/attributes');
const attributes = await attributePromise;
const promoted = attributes.filter(attr =>
(attr.type === 'label-definition' || attr.type === 'relation-definition')
@@ -525,7 +540,9 @@ export default {
getCurrentNoteId,
newNoteCreated,
focus,
loadAttributes,
getAttributes,
showAttributes,
refreshAttributes,
saveNote,
saveNoteIfChanged,
noteChanged