zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-15 11:39:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

make note paths work better with hoisted note

Browse source
This commit is contained in:
zadam 2020-04-08 20:38:50 +02:00
parent 6c188982b3
commit 34b8979016
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/public/javascripts/widgets/note_paths.js
View file

@ -1,6 +1,7 @@
import TabAwareWidget from "./tab_aware_widget.js";
import treeService from "../services/tree.js";
import linkService from "../services/link.js";
import hoistedNoteService from "../services/hoisted_note.js";
const TPL = `
<div class="note-paths-widget">
@ -68,12 +69,18 @@ export default class NotePathsWidget extends TabAwareWidget {
let parentNoteId = 'root';
let curPath = '';
let passedHoistedNote = false;
for (let i = 0; i < noteIdsPath.length; i++) {
const noteId = noteIdsPath[i];
curPath += (curPath ? '/' : '') + noteId;
if (noteId !== 'root' || noteIdsPath.length < 3) {
if (noteId === hoistedNoteService.getHoistedNoteId()) {
passedHoistedNote = true;
}
if (passedHoistedNote && (noteId !== hoistedNoteService.getHoistedNoteId() || noteIdsPath.length - i < 3)) {
this.$currentPath.append(
$("<a>")
.attr('href', '#' + curPath)

2
src/public/javascripts/widgets/note_tree.js
View file

@ -790,7 +790,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
}
forceNoteSyncCommand({node}) {
syncService.forceNoteSync(noteId);
syncService.forceNoteSync(node.data.noteId);
}
editNoteTitleCommand({node}) {

3
src/services/sql_init.js
View file

@ -8,6 +8,7 @@ const sql = require('./sql');
const cls = require('./cls');
const utils = require('./utils');
const optionService = require('./options');
const port = require('./port');
const Option = require('../entities/option');
const TaskContext = require('./task_context.js');
@ -55,7 +56,7 @@ async function isDbInitialized() {
async function initDbConnection() {
await cls.init(async () => {
if (!await isDbInitialized()) {
log.info("DB not initialized, please visit setup page to see instructions on how to initialize Trilium.");
log.info(`DB not initialized, please visit setup page` + (utils.isElectron() ? '' : ` - http://[your-server-host]:${await port} to see instructions on how to initialize Trilium.`));
return;
}