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

closing panes

Browse Source
This commit is contained in:
zadam
2021-05-24 22:29:49 +02:00
parent 2f5d3729de
commit 5707b7e29a
14 changed files with 94 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/public/app/services/tab_manager.js
View File

@@ -277,7 +277,7 @@ export default class TabManager extends Component {
await this.openContextWithNote(noteId, true);
}
activateNoteContext(ntxId, triggerEvent = true) {
async activateNoteContext(ntxId, triggerEvent = true) {
if (ntxId === this.activeNtxId) {
return;
}
@@ -285,7 +285,7 @@ export default class TabManager extends Component {
this.activeNtxId = ntxId;
if (triggerEvent) {
this.triggerEvent('activeContextChanged', {
await this.triggerEvent('activeContextChanged', {
noteContext: this.getNoteContextById(ntxId)
});
}
@@ -296,20 +296,23 @@ export default class TabManager extends Component {
}
async removeNoteContext(ntxId) {
const mainNoteContextToRemove = this.getNoteContextById(ntxId).getMainContext();
const noteContextToRemove = this.getNoteContextById(ntxId);
// close dangling autocompletes after closing the tab
$(".aa-input").autocomplete("close");
const ntxIdsToRemove = mainNoteContextToRemove.getSubContexts().map(nc => nc.ntxId);
const ntxIdsToRemove = noteContextToRemove.getSubContexts().map(nc => nc.ntxId);
await this.triggerEvent('beforeTabRemove', { ntxIds: ntxIdsToRemove });
if (this.mainNoteContexts.length <= 1) {
if (!noteContextToRemove.isMainContext()) {
await this.activateNoteContext(noteContextToRemove.getMainContext().ntxId);
}
else if (this.mainNoteContexts.length <= 1) {
await this.openAndActivateEmptyTab();
}
else if (ntxIdsToRemove.includes(this.activeNtxId)) {
const idx = this.mainNoteContexts.findIndex(nc => nc.ntxId === mainNoteContextToRemove.ntxId);
const idx = this.mainNoteContexts.findIndex(nc => nc.ntxId === noteContextToRemove.ntxId);
if (idx === this.mainNoteContexts.length - 1) {
this.activatePreviousTabCommand();