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

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	src/routes/api/sender.js
#	src/services/import/enex.js
This commit is contained in:
zadam
2023-01-10 16:33:31 +01:00
parent 2242397280 5bf9c253f2
commit edbb60f2b5
10 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/public/app/components/tab_manager.js
View File

@@ -477,13 +477,13 @@ export default class TabManager extends Component {
this.openAndActivateEmptyTab();
}
async removeAllTabsCommand() {
async closeAllTabsCommand() {
for (const ntxIdToRemove of this.mainNoteContexts.map(nc => nc.ntxId)) {
await this.removeNoteContext(ntxIdToRemove);
}
}
async removeAllTabsExceptForThisCommand({ntxId}) {
async closeOtherTabsCommand({ntxId}) {
for (const ntxIdToRemove of this.mainNoteContexts.map(nc => nc.ntxId)) {
if (ntxIdToRemove !== ntxId) {
await this.removeNoteContext(ntxIdToRemove);
@@ -491,6 +491,10 @@ export default class TabManager extends Component {
}
}
async closeTabCommand({ntxId}) {
await this.removeNoteContext(ntxId);
}
async moveTabToNewWindowCommand({ntxId}) {
const {notePath, hoistedNoteId} = this.getNoteContextById(ntxId);