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

fixed double refresh of note detail

Browse Source
This commit is contained in:
zadam
2020-02-27 12:26:42 +01:00
parent d71763aedb
commit b2a3e1cc04
6 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/public/javascripts/services/tab_manager.js
View File

@@ -88,13 +88,7 @@ export default class TabManager extends Component {
await this.tabsUpdate.allowUpdateWithoutChange(async () => {
for (const tab of filteredTabs) {
const tabContext = this.openEmptyTab(tab.tabId);
if (tab.active) {
this.activateTab(tabContext.tabId);
}
await tabContext.setNote(tab.notePath);
await this.openTabWithNote(tab.notePath, tab.active, tab.tabId);
}
});
}
@@ -185,11 +179,23 @@ export default class TabManager extends Component {
const tabContext = new TabContext(tabId);
this.child(tabContext);
this.triggerEvent('newTabOpened', {tabId: this.tabId})
this.triggerEvent('newTabOpened', {tabId: this.tabId});
return tabContext;
}
async openTabWithNote(notePath, activate, tabId = null) {
const tabContext = this.openEmptyTab(tabId);
await tabContext.setNote(notePath, !activate); // if activate is false then send normal noteSwitched event
if (activate) {
this.activateTab(tabContext.tabId, false);
this.triggerEvent('tabNoteSwitchedAndActivated');
}
}
async activateOrOpenNote(noteId) {
for (const tabContext of this.getTabContexts()) {
if (tabContext.note && tabContext.note.noteId === noteId) {
@@ -204,14 +210,16 @@ export default class TabManager extends Component {
await tabContext.setNote(noteId);
}
activateTab(tabId) {
activateTab(tabId, triggerEvent = true) {
if (tabId === this.activeTabId) {
return;
}
this.activeTabId = tabId;
this.triggerEvent('activeTabChanged');
if (triggerEvent) {
this.triggerEvent('activeTabChanged');
}
this.tabsUpdate.scheduleUpdate();