Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into next

Browse Source 
# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/stylesheets/style.css
#	src/routes/api/files.js
#	src/routes/routes.js
This commit is contained in:
zadam
2021-04-25 11:14:45 +02:00
parent 79bb249f3b 6f49f870ed
commit 7494491560
55 changed files with 378 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/public/app/services/branches.js
View File

@@ -153,12 +153,12 @@ ws.subscribeToMessages(async message => {
return;
}
if (message.type === 'task-error') {
if (message.type === 'taskError') {
toastService.closePersistent(message.taskId);
toastService.showError(message.message);
} else if (message.type === 'task-progress-count') {
} else if (message.type === 'taskProgressCount') {
toastService.showPersistent(makeToast(message.taskId, "Delete notes in progress: " + message.progressCount));
} else if (message.type === 'task-succeeded') {
} else if (message.type === 'taskSucceeded') {
const toast = makeToast(message.taskId, "Delete finished successfully.");
toast.closeAfter = 5000;
@@ -167,16 +167,16 @@ ws.subscribeToMessages(async message => {
});
ws.subscribeToMessages(async message => {
if (message.taskType !== 'undelete-notes') {
if (message.taskType !== 'undeleteNotes') {
return;
}
if (message.type === 'task-error') {
if (message.type === 'taskError') {
toastService.closePersistent(message.taskId);
toastService.showError(message.message);
} else if (message.type === 'task-progress-count') {
} else if (message.type === 'taskProgressCount') {
toastService.showPersistent(makeToast(message.taskId, "Undeleting notes in progress: " + message.progressCount));
} else if (message.type === 'task-succeeded') {
} else if (message.type === 'taskSucceeded') {
const toast = makeToast(message.taskId, "Undeleting notes finished successfully.");
toast.closeAfter = 5000;