zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-20 15:45:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

consistently use root/ prefix for note paths

Browse source
This commit is contained in:
azivner 2018-10-06 21:32:07 +02:00
parent 257cced182
commit 62de7f28eb
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "trilium",
"version": "0.22.0",
"version": "0.22.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

4
src/public/javascripts/services/link.js
View file

@ -3,7 +3,7 @@ import noteDetailText from './note_detail_text.js';
import treeUtils from './tree_utils.js';
function getNotePathFromLink(url) {
const notePathMatch = /#root([A-Za-z0-9/]*)$/.exec(url);
const notePathMatch = /#(root[A-Za-z0-9/]*)$/.exec(url);
if (notePathMatch === null) {
return null;
@ -14,7 +14,7 @@ function getNotePathFromLink(url) {
}
function getNotePathFromLabel(label) {
const notePathMatch = / \(([#A-Za-z0-9/]+)\)/.exec(label);
const notePathMatch = / \(([A-Za-z0-9/]+)\)/.exec(label);
if (notePathMatch !== null) {
return notePathMatch[1];

2
src/public/javascripts/services/tree.js
View file

@ -86,7 +86,7 @@ async function expandToNote(notePath, expandOpts) {
const node = getNodesByNoteId(childNoteId).find(node => node.data.parentNoteId === parentNoteId);
if (!node) {
console.log(`Can't find node for noteId=${childNoteId} with parentNoteId=${parentNoteId}`);
console.error(`Can't find node for noteId=${childNoteId} with parentNoteId=${parentNoteId}`);
}
if (childNoteId === noteId) {

1
src/services/note_cache.js
View file

@ -192,6 +192,7 @@ function getNoteTitleForPath(path) {
function getSomePath(noteId, path) {
if (noteId === 'root') {
path.push(noteId);
path.reverse();
return path;