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

more tab row refactoring

Browse Source
This commit is contained in:
zadam
2020-01-15 22:27:52 +01:00
parent 1552c3804d
commit cc138ef9f8
4 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,17 +399,23 @@ export default class TabRowWidget extends BasicWidget {
setTabCloseEventListener(tabEl) {
tabEl.querySelector('.note-tab-close')
.addEventListener('click', _ => this.removeTab(tabEl));
.addEventListener('click', _ => this.removeTab(tabEl.getAttribute('data-tab-id')));
tabEl.addEventListener('mousedown', e => {
if (e.which === 2) {
this.removeTab(tabEl);
this.removeTab(tabEl.getAttribute('data-tab-id'));
return true; // event has been handled
}
});
}
get activeTabId() {
const tabEl = this.activeTabEl;
return tabEl ? tabEl.getAttribute('data-tab-id') : null;
}
get activeTabEl() {
return this.$widget.find('.note-tab[active]')[0];
}
@@ -458,40 +464,42 @@ export default class TabRowWidget extends BasicWidget {
return !!this.activeTabEl;
}
async activateTab(tabEl) {
activateTab(tabEl) {
const activeTabEl = this.activeTabEl;
if (activeTabEl === tabEl) return;
if (activeTabEl) activeTabEl.removeAttribute('active');
tabEl.setAttribute('active', '');
await this.trigger('activeTabChanged', { tabEl });
this.trigger('activeTabChanged', { tabId: tabEl.getAttribute('data-tab-id') });
}
async removeTab(tabEl) {
removeTab(tabId) {
const tabEl = this.$widget.find(`[data-tab-id='${tabId}']`)[0];
if (tabEl === this.activeTabEl) {
if (tabEl.nextElementSibling && tabEl.nextElementSibling.classList.contains("note-tab")) {
await this.activateTab(tabEl.nextElementSibling)
this.activateTab(tabEl.nextElementSibling)
} else if (tabEl.previousElementSibling && tabEl.previousElementSibling.classList.contains("note-tab")) {
await this.activateTab(tabEl.previousElementSibling)
this.activateTab(tabEl.previousElementSibling)
}
}
tabEl.parentNode.removeChild(tabEl);
await this.trigger('tabRemove', { tabEl });
this.trigger('tabRemove', { tabId: tabEl.getAttribute('data-tab-id') });
this.cleanUpPreviouslyDraggedTabs();
this.layoutTabs();
this.setupDraggabilly();
this.setVisibility();
}
async removeAllTabs() {
removeAllTabs() {
for (const tabEl of this.tabEls) {
await this.removeTab(tabEl);
this.removeTab(tabEl.getAttribute('data-tab-id'));
}
}
async removeAllTabsExceptForThis(remainingTabEl) {
removeAllTabsExceptForThis(remainingTabEl) {
for (const tabEl of this.tabEls) {
if (remainingTabEl !== tabEl) {
await this.removeTab(tabEl);
this.removeTab(tabEl.getAttribute('data-tab-id'));
}
}
}
@@ -585,7 +593,7 @@ export default class TabRowWidget extends BasicWidget {
})
}
async animateTabMove(tabEl, originIndex, destinationIndex) {
animateTabMove(tabEl, originIndex, destinationIndex) {
if (destinationIndex < originIndex) {
tabEl.parentNode.insertBefore(tabEl, this.tabEls[destinationIndex]);
} else {
@@ -593,7 +601,7 @@ export default class TabRowWidget extends BasicWidget {
tabEl.parentNode.insertBefore(tabEl, beforeEl);
}
await this.trigger('tabReorder', { tabEl, originIndex, destinationIndex });
this.trigger('tabReorder');
this.layoutTabs();
}