mirror of
https://github.com/zadam/trilium.git
synced 2025-11-06 05:15:59 +01:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a98fd509c6 | ||
|
|
a3149aecf4 | ||
|
|
ef825371cf | ||
|
|
b567775129 |
BIN
db/demo.zip
BIN
db/demo.zip
Binary file not shown.
@@ -7,6 +7,6 @@ module.exports = () => {
|
|||||||
beccaLoader.load();
|
beccaLoader.load();
|
||||||
// make sure the hidden subtree exists since the subsequent migrations we will move some existing notes into it (share...)
|
// make sure the hidden subtree exists since the subsequent migrations we will move some existing notes into it (share...)
|
||||||
// in previous releases hidden subtree was created lazily
|
// in previous releases hidden subtree was created lazily
|
||||||
hiddenSubtreeService.checkHiddenSubtree();
|
hiddenSubtreeService.checkHiddenSubtree(true);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "trilium",
|
"name": "trilium",
|
||||||
"version": "0.58.5",
|
"version": "0.58.6",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "trilium",
|
"name": "trilium",
|
||||||
"version": "0.58.5",
|
"version": "0.58.6",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "trilium",
|
"name": "trilium",
|
||||||
"productName": "Trilium Notes",
|
"productName": "Trilium Notes",
|
||||||
"description": "Trilium Notes",
|
"description": "Trilium Notes",
|
||||||
"version": "0.58.6",
|
"version": "0.58.7",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"main": "electron.js",
|
"main": "electron.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|||||||
@@ -83,10 +83,8 @@ function getNoteTitleArrayForPath(notePathArray) {
|
|||||||
throw new Error(`${notePathArray} is not an array.`);
|
throw new Error(`${notePathArray} is not an array.`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const hoistedNoteId = cls.getHoistedNoteId();
|
if (notePathArray.length === 1) {
|
||||||
|
return [getNoteTitle(notePathArray[0])];
|
||||||
if (notePathArray.length === 1 && notePathArray[0] === hoistedNoteId) {
|
|
||||||
return [getNoteTitle(hoistedNoteId)];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const titles = [];
|
const titles = [];
|
||||||
@@ -95,6 +93,7 @@ function getNoteTitleArrayForPath(notePathArray) {
|
|||||||
let hoistedNotePassed = false;
|
let hoistedNotePassed = false;
|
||||||
|
|
||||||
// this is a notePath from outside of hoisted subtree so full title path needs to be returned
|
// this is a notePath from outside of hoisted subtree so full title path needs to be returned
|
||||||
|
const hoistedNoteId = cls.getHoistedNoteId();
|
||||||
const outsideOfHoistedSubtree = !notePathArray.includes(hoistedNoteId);
|
const outsideOfHoistedSubtree = !notePathArray.includes(hoistedNoteId);
|
||||||
|
|
||||||
for (const noteId of notePathArray) {
|
for (const noteId of notePathArray) {
|
||||||
|
|||||||
@@ -303,7 +303,7 @@ export default class GlobalMenuWidget extends BasicWidget {
|
|||||||
const resp = await fetch(RELEASES_API_URL);
|
const resp = await fetch(RELEASES_API_URL);
|
||||||
const data = await resp.json();
|
const data = await resp.json();
|
||||||
|
|
||||||
return data.tag_name.substring(1);
|
return data?.tag_name?.substring(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
downloadLatestVersionCommand() {
|
downloadLatestVersionCommand() {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
module.exports = { buildDate:"2023-01-16T22:39:28+01:00", buildRevision: "9fd0b85ff2be264be35ec2052c956b654f0dac9e" };
|
module.exports = { buildDate:"2023-01-17T23:14:58+01:00", buildRevision: "a3149aecf41bac3c559ebbd1865e916264985ac3" };
|
||||||
|
|||||||
@@ -234,8 +234,8 @@ const HIDDEN_SUBTREE_DEFINITION = {
|
|||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
||||||
function checkHiddenSubtree() {
|
function checkHiddenSubtree(force = false) {
|
||||||
if (!migrationService.isDbUpToDate()) {
|
if (!force && !migrationService.isDbUpToDate()) {
|
||||||
// on-delete hook might get triggered during some future migration and cause havoc
|
// on-delete hook might get triggered during some future migration and cause havoc
|
||||||
log.info("Will not check hidden subtree until migration is finished.");
|
log.info("Will not check hidden subtree until migration is finished.");
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user