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

fixes and right pane layout changes

Browse Source
This commit is contained in:
zadam 2020-02-25 16:31:44 +01:00
parent d821ea4095
commit 7270bf287d
7 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/javascripts/services/tree_cache.js
View File

@ -105,8 +105,8 @@ class TreeCache {
const targetNote = this.notes[attributeRow.value]; const targetNote = this.notes[attributeRow.value];
if (targetNote) { if (targetNote) {
if (!note.targetRelations.includes(attributeId)) { if (!targetNote.targetRelations.includes(attributeId)) {
note.targetRelations.push(attributeId); targetNote.targetRelations.push(attributeId);
} }
} }
} }

2
src/public/javascripts/services/ws.js
View File

@ -288,7 +288,7 @@ async function processSyncRows(syncRows) {
} }
if (targetNote) { if (targetNote) {
targetNote.targetRelations = targetNote.targetRelations.filter(attributeId => attributeId !== attribute.value); targetNote.targetRelations = targetNote.targetRelations.filter(attributeId => attributeId !== attribute.attributeId);
} }
} }
} }

14
src/public/javascripts/widgets/collapsible_widget.js
View File

@ -14,7 +14,7 @@ const WIDGET_TPL = `
<div class="widget-header-actions"></div> <div class="widget-header-actions"></div>
</div> </div>
<div id="[to be set]" class="collapse body-wrapper" style="transition: none;"> <div id="[to be set]" class="collapse body-wrapper" style="transition: none; ">
<div class="card-body"></div> <div class="card-body"></div>
</div> </div>
</div> </div>
@ -27,26 +27,16 @@ export default class CollapsibleWidget extends TabAwareWidget {
getHelp() { return {}; } getHelp() { return {}; }
getMaxHeight() { return null; }
doRender() { doRender() {
this.$widget = $(WIDGET_TPL); this.$widget = $(WIDGET_TPL);
this.$widget.find('[data-target]').attr('data-target', "#" + this.componentId); this.$widget.find('[data-target]').attr('data-target', "#" + this.componentId);
this.$bodyWrapper = this.$widget.find('.body-wrapper'); this.$bodyWrapper = this.$widget.find('.body-wrapper');
this.$bodyWrapper.attr('id', this.componentId); this.$bodyWrapper.attr('id', this.componentId); // for toggle to work we need id
this.$bodyWrapper.collapse("show"); this.$bodyWrapper.collapse("show");
this.$body = this.$bodyWrapper.find('.card-body'); this.$body = this.$bodyWrapper.find('.card-body');
const maxHeight = this.getMaxHeight();
if (maxHeight) {
this.$body.css("max-height", maxHeight);
this.$body.css("overflow", "auto");
}
this.$title = this.$widget.find('.widget-title'); this.$title = this.$widget.find('.widget-title');
this.$title.text(this.getWidgetTitle()); this.$title.text(this.getWidgetTitle());

2
src/public/javascripts/widgets/edited_notes.js
View File

@ -12,8 +12,6 @@ export default class EditedNotesWidget extends CollapsibleWidget {
}; };
} }
getMaxHeight() { return "200px"; }
isEnabled() { isEnabled() {
return super.isEnabled() return super.isEnabled()
&& this.note.hasOwnedLabel("dateNote"); && this.note.hasOwnedLabel("dateNote");

2
src/public/javascripts/widgets/similar_notes.js
View File

@ -12,8 +12,6 @@ export default class SimilarNotesWidget extends CollapsibleWidget {
}; };
} }
getMaxHeight() { return "200px"; }
noteSwitched() { noteSwitched() {
const noteId = this.noteId; const noteId = this.noteId;

2
src/public/javascripts/widgets/what_links_here.js
View File

@ -4,8 +4,6 @@ import linkService from "../services/link.js";
export default class WhatLinksHereWidget extends CollapsibleWidget { export default class WhatLinksHereWidget extends CollapsibleWidget {
getWidgetTitle() { return "What links here"; } getWidgetTitle() { return "What links here"; }
getMaxHeight() { return "200px"; }
getHelp() { getHelp() {
return { return {
title: "This list contains all notes which link to this note through links and relations." title: "This list contains all notes which link to this note through links and relations."

9
src/public/stylesheets/desktop.css
View File

@ -142,6 +142,9 @@ body {
#right-pane .card { #right-pane .card {
border: 0; border: 0;
min-height: 0;
display: flex;
flex-direction: column;
} }
#right-pane .card-header { #right-pane .card-header {
@ -183,10 +186,16 @@ body {
text-decoration: none; text-decoration: none;
} }
#right-pane .body-wrapper {
overflow: auto;
}
#right-pane .card-body { #right-pane .card-body {
width: 100%; width: 100%;
padding: 8px; padding: 8px;
border: 0; border: 0;
height: 100%;
overflow: auto;
} }
#right-pane .card-body ul { #right-pane .card-body ul {