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

note paths is now on the left side and showing current path

Browse Source
This commit is contained in:
zadam 2020-04-07 22:53:03 +02:00
parent f8bd55374f
commit 6cc3e3cdf6
7 changed files with 81 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
libraries/ckeditor/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

13
src/public/javascripts/services/tree.js
View File

@ -263,6 +263,16 @@ function getHashValueFromAddress() {
return str.split("-");
}
function parseNotePath(notePath) {
let noteIds = notePath.split('/');
if (noteIds[0] !== 'root') {
noteIds = ['root'].concat(noteIds);
}
return noteIds;
}
export default {
sortAlphabetically,
resolveNotePath,
@ -274,5 +284,6 @@ export default {
getNoteIdAndParentIdFromNotePath,
getNoteTitle,
getNotePathTitle,
getHashValueFromAddress
getHashValueFromAddress,
parseNotePath
};

7
src/public/javascripts/widgets/basic_widget.js
View File

@ -55,7 +55,12 @@ class BasicWidget extends Component {
}
for (const key in this.attrs) {
$widget.attr(key, this.attrs[key]);
if (key === 'style') {
$widget.attr(key, $widget.attr('style') + ';' + this.attrs[key]);
}
else {
$widget.attr(key, this.attrs[key]);
}
}
for (const className of this.classes) {

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

@ -123,13 +123,13 @@ export default class DesktopLayout {
.child(new GlobalButtonsWidget())
.child(new SearchBoxWidget())
.child(new SearchResultsWidget())
.child(new TabCachingWidget(() => new NotePathsWidget()))
.child(appContext.mainTreeWidget)
.child(...this.customWidgets.get('left-pane'))
)
.child(new FlexContainer('column').id('center-pane')
.child(new FlexContainer('row').class('title-row')
.cssBlock('.title-row > * { margin: 5px; }')
.child(new TabCachingWidget(() => new NotePathsWidget()).hideInZenMode())
.child(new NoteTitleWidget())
.child(new RunScriptButtonsWidget().hideInZenMode())
.child(new ProtectedNoteSwitchWidget().hideInZenMode())

1
src/public/javascripts/widgets/global_buttons.js
View File

@ -6,7 +6,6 @@ const WIDGET_TPL = `
.global-buttons {
display: flex;
justify-content: space-around;
padding: 3px 0 3px 0;
border: 1px solid var(--main-border-color);
border-radius: 7px;
margin: 3px 5px 5px 5px;

71
src/public/javascripts/widgets/note_paths.js
View File

@ -3,35 +3,84 @@ import treeService from "../services/tree.js";
import linkService from "../services/link.js";
const TPL = `
<div class="dropdown hide-in-zen-mode">
<div style="display: flex; flex-direction: row; padding: 10px;">
<style>
.note-path-list a.current {
font-weight: bold;
}
.note-path-list-button {
padding: 0;
width: 24px;
height: 24px;
margin-left: 5px;
position: relative;
top: -2px;
}
.note-path-list-button::after {
display: none !important; // disabling the standard caret
}
.current-path {
flex-grow: 1;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
<button class="btn btn-sm dropdown-toggle note-path-list-button" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="note-path-count">1 path</span>
<div class="current-path"></div>
<span class="caret"></span>
</button>
<ul class="note-path-list dropdown-menu" aria-labelledby="note-path-list-button">
</ul>
<div class="dropdown hide-in-zen-mode">
<button class="btn btn-sm dropdown-toggle note-path-list-button bx bx-caret-down" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
<ul class="note-path-list dropdown-menu dropdown-menu-right" aria-labelledby="note-path-list-button">
</ul>
</div>
</div>`;
export default class NotePathsWidget extends TabAwareWidget {
doRender() {
this.$widget = $(TPL);
this.$notePathList = this.$widget.find(".note-path-list");
this.$notePathCount = this.$widget.find(".note-path-count");
this.$currentPath = this.$widget.find('.current-path');
this.$dropdown = this.$widget.find(".dropdown");
this.$widget.on('show.bs.dropdown', () => this.renderDropdown());
this.$notePathList = this.$dropdown.find(".note-path-list");
this.$dropdown.on('show.bs.dropdown', () => this.renderDropdown());
return this.$widget;
}
async refreshWithNote(note, notePath) {
let noteIdsPath = treeService.parseNotePath(notePath);
noteIdsPath = noteIdsPath.slice(0, noteIdsPath.length - 1);
this.$currentPath.empty();
let parentNoteId = 'root';
let curPath = '';
for (let i = 0; i < noteIdsPath.length; i++) {
const noteId = noteIdsPath[i];
curPath += (curPath ? '/' : '') + noteId;
this.$currentPath.append(
$("<a>")
.attr('href', '#' + curPath)
.addClass('no-tooltip-preview')
.text(await treeService.getNoteTitle(noteId, parentNoteId))
);
if (i !== noteIdsPath.length - 1) {
this.$currentPath.append(' / ');
}
parentNoteId = noteId;
}
const pathCount = note.noteId === 'root'
? 1 // root doesn't have any parent, but it's still technically 1 path
: note.getBranchIds().length;
@ -47,7 +96,7 @@ export default class NotePathsWidget extends TabAwareWidget {
return;
}
const pathSegments = this.notePath.split("/");
const pathSegments = treeService.parseNotePath(this.notePath);
const activeNoteParentNoteId = pathSegments[pathSegments.length - 2]; // we know this is not root so there must be a parent
for (const parentNote of this.note.getParentNotes()) {