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

Merge branch 'stable'

Browse Source
This commit is contained in:
zadam 2019-06-29 20:37:51 +02:00
commit 2f3b256272
6 changed files with 8 additions and 6 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", "name": "trilium",
"version": "0.33.3", "version": "0.33.4",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@ -2,7 +2,7 @@
"name": "trilium", "name": "trilium",
"productName": "Trilium Notes", "productName": "Trilium Notes",
"description": "Trilium Notes", "description": "Trilium Notes",
"version": "0.33.3", "version": "0.33.4",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js", "main": "electron.js",
"bin": { "bin": {

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

@ -102,7 +102,7 @@ async function deleteNodes(nodes) {
next = nodes[0].getPrevSibling(); next = nodes[0].getPrevSibling();
} }
if (!next && !hoistedNoteService.isTopLevelNode(nodes[0])) { if (!next && !await hoistedNoteService.isTopLevelNode(nodes[0])) {
next = nodes[0].getParent(); next = nodes[0].getParent();
} }

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

@ -630,7 +630,8 @@ async function createNote(node, parentNoteId, target, extraOptions = {}) {
extraClasses: await treeBuilder.getExtraClasses(noteEntity), extraClasses: await treeBuilder.getExtraClasses(noteEntity),
icon: await treeBuilder.getIcon(noteEntity), icon: await treeBuilder.getIcon(noteEntity),
folder: extraOptions.type === 'search', folder: extraOptions.type === 'search',
lazy: true lazy: true,
key: utils.randomString(12) // this should prevent some "duplicate key" errors
}; };
if (target === 'after') { if (target === 'after') {

3
src/public/javascripts/services/tree_builder.js
View File

@ -83,7 +83,8 @@ async function prepareNode(branch) {
icon: await getIcon(note), icon: await getIcon(note),
refKey: note.noteId, refKey: note.noteId,
expanded: branch.isExpanded || hoistedNoteId === note.noteId, expanded: branch.isExpanded || hoistedNoteId === note.noteId,
lazy: true lazy: true,
key: utils.randomString(12) // this should prevent some "duplicate key" errors
}; };
if (note.hasChildren() || note.type === 'search') { if (note.hasChildren() || note.type === 'search') {

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2019-06-24T20:47:50+02:00", buildRevision: "1b831f94a98dbbb7184048f329ea89175841dec2" }; module.exports = { buildDate:"2019-06-26T21:20:30+02:00", buildRevision: "a3951f1cce978699d81f312c590d71f6ca4c6771" };