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

refactor: 💡 remove redundant code

Browse Source
This commit is contained in:
Jin
2025-03-18 17:39:59 +01:00
parent 0858f531e4
commit e12be14dc9
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/public/app/components/tab_manager.ts
View File

@@ -550,9 +550,7 @@ export default class TabManager extends Component {
} }
async closeActiveTabCommand() { async closeActiveTabCommand() {
if (this.activeNtxId) { await this.removeNoteContext(this.activeNtxId);
await this.removeNoteContext(this.activeNtxId);
}
} }
beforeUnloadEvent(): boolean { beforeUnloadEvent(): boolean {
@@ -566,15 +564,13 @@ export default class TabManager extends Component {
async closeAllTabsCommand() { async closeAllTabsCommand() {
for (const ntxIdToRemove of this.mainNoteContexts.map((nc) => nc.ntxId)) { for (const ntxIdToRemove of this.mainNoteContexts.map((nc) => nc.ntxId)) {
if (ntxIdToRemove) { await this.removeNoteContext(ntxIdToRemove);
await this.removeNoteContext(ntxIdToRemove);
}
} }
} }
async closeOtherTabsCommand({ ntxId }: { ntxId: string }) { async closeOtherTabsCommand({ ntxId }: { ntxId: string }) {
for (const ntxIdToRemove of this.mainNoteContexts.map((nc) => nc.ntxId)) { for (const ntxIdToRemove of this.mainNoteContexts.map((nc) => nc.ntxId)) {
if (ntxIdToRemove && ntxIdToRemove !== ntxId) { if (ntxIdToRemove !== ntxId) {
await this.removeNoteContext(ntxIdToRemove); await this.removeNoteContext(ntxIdToRemove);
} }
} }
@@ -587,9 +583,7 @@ export default class TabManager extends Component {
if (index !== -1) { if (index !== -1) {
const idsToRemove = ntxIds.slice(index + 1); const idsToRemove = ntxIds.slice(index + 1);
for (const ntxIdToRemove of idsToRemove) { for (const ntxIdToRemove of idsToRemove) {
if (ntxIdToRemove) { await this.removeNoteContext(ntxIdToRemove);
await this.removeNoteContext(ntxIdToRemove);
}
} }
} }
} }

4
src/public/app/widgets/tab_row.ts
View File

@@ -419,13 +419,13 @@ export default class TabRowWidget extends BasicWidget {
closeActiveTabCommand({ $el }: CommandListenerData<"closeActiveTab">) { closeActiveTabCommand({ $el }: CommandListenerData<"closeActiveTab">) {
const ntxId = $el.closest(".note-tab").attr("data-ntx-id"); const ntxId = $el.closest(".note-tab").attr("data-ntx-id");
appContext.tabManager.removeNoteContext(ntxId ?? null); appContext.tabManager.removeNoteContext(ntxId);
} }
setTabCloseEvent($tab: JQuery<HTMLElement>) { setTabCloseEvent($tab: JQuery<HTMLElement>) {
$tab.on("mousedown", (e) => { $tab.on("mousedown", (e) => {
if (e.which === 2) { if (e.which === 2) {
appContext.tabManager.removeNoteContext($tab.attr("data-ntx-id") ?? null); appContext.tabManager.removeNoteContext($tab.attr("data-ntx-id"));
return true; // event has been handled return true; // event has been handled
} }