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

refactored TabContext => NoteContext

Browse Source
This commit is contained in:
zadam
2021-05-22 12:35:41 +02:00
parent 274cf7312c
commit 79a85a0aa7
60 changed files with 187 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/public/app/widgets/containers/pane_container.js
View File

@@ -14,14 +14,14 @@ export default class PaneContainer extends FlexContainer {
this.css('flex-grow', '1');
}
async newTabOpenedEvent({noteContext}) {
async newNoteContextCreatedEvent({noteContext}) {
const widget = this.widgetFactory();
const $renderedWidget = widget.render();
$renderedWidget.attr("data-tab-id", noteContext.ntxId);
$renderedWidget.on('click', () => appContext.tabManager.activateTab(noteContext.ntxId));
$renderedWidget.on('click', () => appContext.tabManager.activateNoteContext(noteContext.ntxId));
this.$widget.append($renderedWidget);
@@ -35,9 +35,9 @@ export default class PaneContainer extends FlexContainer {
}
async openNewPaneCommand() {
const noteContext = await appContext.tabManager.openEmptyTab(null, 'root', appContext.tabManager.getActiveNoteContext().ntxId);
const noteContext = await appContext.tabManager.openEmptyTab(null, 'root', appContext.tabManager.getActiveContext().ntxId);
await appContext.tabManager.activateTab(noteContext.ntxId);
await appContext.tabManager.activateNoteContext(noteContext.ntxId);
await noteContext.setEmpty();
}
@@ -49,7 +49,7 @@ export default class PaneContainer extends FlexContainer {
toggleInt(show) {} // not needed
toggleExt(show) {
const activeTabId = appContext.tabManager.getActiveNoteContext().getMainNoteContext().ntxId;
const activeTabId = appContext.tabManager.getActiveContext().getMainNoteContext().ntxId;
for (const ntxId in this.widgets) {
const noteContext = appContext.tabManager.getNoteContextById(ntxId);
@@ -69,7 +69,7 @@ export default class PaneContainer extends FlexContainer {
* activation further note switches are always propagated to the tabs.
*/
handleEventInChildren(name, data) {
if (['tabNoteSwitched', 'tabNoteSwitchedAndActivated'].includes(name)) {
if (['noteSwitched', 'noteSwitchedAndActivated'].includes(name)) {
// this event is propagated only to the widgets of a particular tab
const widget = this.widgets[data.noteContext.ntxId];
@@ -79,7 +79,7 @@ export default class PaneContainer extends FlexContainer {
const promises = [];
if (appContext.tabManager.getActiveNoteContext().getMainNoteContext() === data.noteContext.getMainNoteContext()) {
if (appContext.tabManager.getActiveContext().getMainNoteContext() === data.noteContext.getMainNoteContext()) {
promises.push(widget.handleEvent('activeTabChanged', data));
}
@@ -95,14 +95,14 @@ export default class PaneContainer extends FlexContainer {
continue;
}
if (subNoteContext === data.noteContext && (subWidget.hasBeenAlreadyShown || name === 'tabNoteSwitchedAndActivated')) {
if (subNoteContext === data.noteContext && (subWidget.hasBeenAlreadyShown || name === 'noteSwitchedAndActivated')) {
subWidget.hasBeenAlreadyShown = true;
promises.push(widget.handleEvent('tabNoteSwitched', data));
promises.push(widget.handleEvent('noteSwitched', data));
}
}
if (name === 'tabNoteSwitchedAndActivated') {
if (name === 'noteSwitchedAndActivated') {
this.toggleExt(true);
}