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

delete preview takes into account strong/weak branches

Browse source
This commit is contained in:
zadam 2022-12-24 13:15:19 +01:00
parent b6f7c604c7
commit 5a2907b670
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/public/app/components/tab_manager.js
View file

@ -413,7 +413,7 @@ export default class TabManager extends Component {
return;
}
this.recentlyClosedTabs.push(noteContexts);console.log(this.recentlyClosedTabs);
this.recentlyClosedTabs.push(noteContexts);
}
tabReorderEvent({ntxIdsInOrder}) {

12
src/routes/api/notes.js
View file

@ -235,15 +235,19 @@ function getDeleteNotesPreview(req) {
const {branchIdsToDelete, deleteAllClones} = req.body;
const noteIdsToBeDeleted = new Set();
const branchCountToDelete = {}; // noteId => count (integer)
const strongBranchCountToDelete = {}; // noteId => count (integer)
function branchPreviewDeletion(branch) {
branchCountToDelete[branch.branchId] = branchCountToDelete[branch.branchId] || 0;
branchCountToDelete[branch.branchId]++;
if (branch.isWeak) {
return;
}
strongBranchCountToDelete[branch.branchId] = strongBranchCountToDelete[branch.branchId] || 0;
strongBranchCountToDelete[branch.branchId]++;
const note = branch.getNote();
if (deleteAllClones || note.getParentBranches().length <= branchCountToDelete[branch.branchId]) {
if (deleteAllClones || note.getStrongParentBranches().length <= strongBranchCountToDelete[branch.branchId]) {
noteIdsToBeDeleted.add(note.noteId);
for (const childBranch of note.getChildBranches()) {