gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into m41

Browse Source 
# Conflicts:
#	src/public/javascripts/services/sidebar.js
#	src/public/javascripts/services/tab_context.js
#	src/public/javascripts/services/tree.js
This commit is contained in:
zadam 2020-02-01 20:01:30 +01:00
commit 513ce1a183
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.40.1", "version": "0.40.2",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js", "main": "electron.js",
"bin": { "bin": {

2
src/public/javascripts/mobile.js
View File

@ -86,6 +86,8 @@ async function showTree() {
}); });
} }
}); });
treeService.setTree($.ui.fancytree.getTree("#tree"));
} }
$detail.on("click", ".note-menu-button", async e => { $detail.on("click", ".note-menu-button", async e => {

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

@ -43,7 +43,7 @@ class CalendarWidget extends StandardWidget {
} }
init($el, activeDate) { init($el, activeDate) {
this.activeDate = new Date(Date.parse(activeDate)); this.activeDate = new Date(activeDate + "T12:00:00"); // attaching time fixes local timezone handling
this.todaysDate = new Date(); this.todaysDate = new Date();
this.date = new Date(this.activeDate.getTime()); this.date = new Date(this.activeDate.getTime());

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2020-01-19T15:45:06+01:00", buildRevision: "ab535bf147edac113299f76f410ff88b2c06735b" }; module.exports = { buildDate:"2020-02-01T10:17:51+01:00", buildRevision: "0f25c8a95f381d99b66735b9c0af3e319edb72ed" };

4
src/services/cloning.js
View File

@ -7,6 +7,7 @@ const noteService = require('./notes');
const repository = require('./repository'); const repository = require('./repository');
const Branch = require('../entities/branch'); const Branch = require('../entities/branch');
const TaskContext = require("./task_context.js"); const TaskContext = require("./task_context.js");
const utils = require('./utils');
async function cloneNoteToParent(noteId, parentNoteId, prefix) { async function cloneNoteToParent(noteId, parentNoteId, prefix) {
if (await isNoteDeleted(noteId) || await isNoteDeleted(parentNoteId)) { if (await isNoteDeleted(noteId) || await isNoteDeleted(parentNoteId)) {
@ -54,7 +55,8 @@ async function ensureNoteIsAbsentFromParent(noteId, parentNoteId) {
const branch = await repository.getEntity(`SELECT * FROM branches WHERE noteId = ? AND parentNoteId = ? AND isDeleted = 0`, [noteId, parentNoteId]); const branch = await repository.getEntity(`SELECT * FROM branches WHERE noteId = ? AND parentNoteId = ? AND isDeleted = 0`, [noteId, parentNoteId]);
if (branch) { if (branch) {
await noteService.deleteBranch(branch, new TaskContext()); const deleteId = utils.randomString(10);
await noteService.deleteBranch(branch, deleteId, new TaskContext());
} }
} }