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

click on inherited attr will also bring up the attribute detail widget

Browse Source
This commit is contained in:
zadam
2020-07-05 23:53:55 +02:00
parent 9f2545395d
commit 50b976990c
4 changed files with 87 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/public/app/widgets/note_attributes.js
View File

@@ -329,7 +329,12 @@ export default class NoteAttributesWidget extends TabAwareWidget {
}
}
this.attributeDetailWidget.showAttributeDetail(matchedAttr, e.pageX, e.pageY);
this.attributeDetailWidget.showAttributeDetail({
attribute: matchedAttr,
isOwned: true,
x: e.pageX,
y: e.pageY
});
}
});
@@ -419,7 +424,7 @@ export default class NoteAttributesWidget extends TabAwareWidget {
const ownedAttributes = note.getOwnedAttributes();
const $attributesContainer = $("<div>");
await this.renderAttributes(ownedAttributes, $attributesContainer);
await this.renderAttributesIntoCKEditor(ownedAttributes, $attributesContainer);
await this.spacedUpdate.allowUpdateWithoutChange(() => {
this.textEditor.setData($attributesContainer.html());
@@ -440,7 +445,7 @@ export default class NoteAttributesWidget extends TabAwareWidget {
this.$inheritedAttributes.empty();
await this.renderAttributes(inheritedAttributes, this.$inheritedAttributes);
await this.renderAttributesIntoDiv(inheritedAttributes, this.$inheritedAttributes);
this.parseAttributes();
}
@@ -457,32 +462,57 @@ export default class NoteAttributesWidget extends TabAwareWidget {
});
}
async renderAttributes(attributes, $container) {
async renderAttributesIntoCKEditor(attributes, $container) {
for (const attribute of attributes) {
if (attribute.type === 'label') {
$container.append(document.createTextNode('#' + attribute.name));
this.renderAttribute(attribute, $container);
}
}
if (attribute.value) {
$container.append('=');
$container.append(document.createTextNode(this.formatValue(attribute.value)));
}
renderAttributesIntoDiv(attributes, $container) {
for (const attribute of attributes) {
const $span = $("<span>")
.on('click', e => this.attributeDetailWidget.showAttributeDetail({
attribute: {
noteId: attribute.noteId,
type: attribute.type,
name: attribute.name,
value: attribute.value
},
isOwned: false,
x: e.pageX,
y: e.pageY
}));
$container.append(' ');
} else if (attribute.type === 'relation') {
if (attribute.isAutoLink) {
continue;
}
$container.append($span);
if (attribute.value) {
$container.append(document.createTextNode('~' + attribute.name + "="));
$container.append(this.createNoteLink(attribute.value));
$container.append(" ");
} else {
ws.logError(`Relation ${attribute.attributeId} has empty target`);
}
} else {
ws.logError("Unknown attr type: " + attribute.type);
this.renderAttribute(attribute, $span);
}
}
renderAttribute(attribute, $container) {
if (attribute.type === 'label') {
$container.append(document.createTextNode('#' + attribute.name));
if (attribute.value) {
$container.append('=');
$container.append(document.createTextNode(this.formatValue(attribute.value)));
}
$container.append(' ');
} else if (attribute.type === 'relation') {
if (attribute.isAutoLink) {
return;
}
if (attribute.value) {
$container.append(document.createTextNode('~' + attribute.name + "="));
$container.append(this.createNoteLink(attribute.value));
$container.append(" ");
} else {
ws.logError(`Relation ${attribute.attributeId} has empty target`);
}
} else {
ws.logError("Unknown attr type: " + attribute.type);
}
}