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

fixes in closing tabs and elsewhere

Browse Source
This commit is contained in:
zadam
2020-02-09 21:13:05 +01:00
parent 4401a8e1e8
commit 826c434630
15 changed files with 94 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/public/javascripts/widgets/tab_row.js
View File

@@ -261,11 +261,7 @@ export default class TabRowWidget extends BasicWidget {
];
},
selectContextMenuItem: (e, cmd) => {
if (cmd === 'removeAllTabs') {
this.trigger('removeAllTabs');
} else if (cmd === 'removeAllTabsExceptForThis') {
this.trigger('removeAllTabsExceptForThis', {tabId});
}
this.trigger(cmd, {tabId});
}
});
});
@@ -398,11 +394,11 @@ export default class TabRowWidget extends BasicWidget {
setTabCloseEventListener($tab) {
$tab.find('.note-tab-close')
.on('click', _ => this.appContext.removeTab($tab.attr('data-tab-id')));
.on('click', _ => this.tabManager.removeTab($tab.attr('data-tab-id')));
$tab.on('mousedown', e => {
if (e.which === 2) {
this.appContext.removeTab($tab.attr('data-tab-id'));
this.tabManager.removeTab($tab.attr('data-tab-id'));
return true; // event has been handled
}
@@ -413,12 +409,14 @@ export default class TabRowWidget extends BasicWidget {
return this.$widget.find('.note-tab[active]')[0];
}
activeTabChangedListener({newActiveTabId}) {
activeTabChangedListener() {
const newActiveTabId = this.tabManager.activeTabId;
const tabEl = this.getTabById(newActiveTabId)[0];
const activeTabEl = this.activeTabEl;
if (activeTabEl === tabEl) return;
if (activeTabEl) activeTabEl.removeAttribute('active');
tabEl.setAttribute('active', '');
if (tabEl) tabEl.setAttribute('active', '');
}
newTabOpenedListener({tabId}) {
@@ -603,7 +601,7 @@ export default class TabRowWidget extends BasicWidget {
}
async entitiesReloadedListener({loadResults}) {
for (const tabContext of this.tabManager.getTabContexts()) {
for (const tabContext of this.tabManager.tabContexts) {
if (loadResults.isNoteReloaded(tabContext.noteId)) {
const $tab = this.getTabById(tabContext.tabId);
@@ -613,7 +611,7 @@ export default class TabRowWidget extends BasicWidget {
}
treeCacheReloadedListener() {
for (const tabContext of this.tabManager.getTabContexts()) {
for (const tabContext of this.tabManager.tabContexts) {
const $tab = this.getTabById(tabContext.tabId);
this.updateTab($tab, tabContext.note);