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

refactoring of note detail API

Browse Source
This commit is contained in:
zadam
2020-01-24 17:54:47 +01:00
parent 4b66765cc1
commit 606d5afcab
18 changed files with 107 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/public/javascripts/services/app_context.js
View File

@@ -216,20 +216,11 @@ class AppContext {
}
async switchToTab(tabId, notePath) {
const tabContext = this.tabContexts.find(tc => tc.tabId === tabId);
const tabContext = this.tabContexts.find(tc => tc.tabId === tabId)
|| this.openEmptyTab();
if (!tabContext) {
await noteDetailService.loadNoteDetail(notePath, {
newTab: true,
activate: true
});
} else {
await this.activateTab(tabContext.tabId);
if (notePath && tabContext.notePath !== notePath) {
await tabContext.setNote(notePath);
}
}
this.activateTab(tabContext.tabId);
await tabContext.setNote(notePath);
}
/**
@@ -252,18 +243,6 @@ class AppContext {
}
}
async reloadAllTabs() {
for (const tabContext of this.tabContexts) {
await this.reloadTab(tabContext);
}
}
async reloadTab(tc) {
if (tc.note) {
noteDetailService.reloadNote(tc);
}
}
async openAndActivateEmptyTab() {
const tabContext = this.openEmptyTab();
@@ -278,6 +257,20 @@ class AppContext {
return tabContext;
}
async activateOrOpenNote(noteId) {
for (const tabContext of this.getTabContexts()) {
if (tabContext.note && tabContext.note.noteId === noteId) {
await tabContext.activate();
return;
}
}
// if no tab with this note has been found we'll create new tab
const tabContext = this.openEmptyTab();
await tabContext.setNote(noteId);
}
async filterTabs(noteId) {
for (const tc of this.tabContexts) {
if (tc.notePath && !tc.notePath.split("/").includes(noteId)) {
@@ -318,7 +311,7 @@ class AppContext {
}
}
openTabsChanged() {
openTabsChangedListener() {
// we don't want to send too many requests with tab changes so we always schedule task to do this in 1 seconds,
// but if there's any change in between, we cancel the old one and schedule new one
// so effectively we kind of wait until user stopped e.g. quickly switching tabs
@@ -327,7 +320,7 @@ class AppContext {
this.tabsChangedTaskId = setTimeout(() => this.saveOpenTabs(), 1000);
}
async activateTab(tabId) {
activateTab(tabId) {
this.activeTabId = tabId;
this.trigger('activeTabChanged', { tabId: this.activeTabId });
@@ -364,11 +357,11 @@ class AppContext {
this.tabContexts = this.tabContexts.filter(tc => tc.tabId === tabId);
this.openTabsChanged();
this.openTabsChangedListener();
}
tabReorderListener() {
this.openTabsChanged();
this.openTabsChangedListener();
}
noteChangesSavedListener() {