mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
refactored layout out of app context
This commit is contained in:
zadam
parent
92f6558e55
commit
d79ae261e1
@ -1,43 +1,20 @@
|
|||||||
import GlobalButtonsWidget from "../widgets/global_buttons.js";
|
|
||||||
import SearchBoxWidget from "../widgets/search_box.js";
|
|
||||||
import SearchResultsWidget from "../widgets/search_results.js";
|
|
||||||
import NoteTreeWidget from "../widgets/note_tree.js";
|
import NoteTreeWidget from "../widgets/note_tree.js";
|
||||||
import TabContext from "./tab_context.js";
|
import TabContext from "./tab_context.js";
|
||||||
import server from "./server.js";
|
import server from "./server.js";
|
||||||
import TabRowWidget from "../widgets/tab_row.js";
|
import TabRowWidget from "../widgets/tab_row.js";
|
||||||
import NoteTitleWidget from "../widgets/note_title.js";
|
|
||||||
import PromotedAttributesWidget from "../widgets/promoted_attributes.js";
|
|
||||||
import NoteDetailWidget from "../widgets/note_detail.js";
|
|
||||||
import TabCachingWidget from "../widgets/tab_caching_widget.js";
|
|
||||||
import NoteInfoWidget from "../widgets/note_info.js";
|
|
||||||
import NoteRevisionsWidget from "../widgets/note_revisions.js";
|
|
||||||
import LinkMapWidget from "../widgets/link_map.js";
|
|
||||||
import SimilarNotesWidget from "../widgets/similar_notes.js";
|
|
||||||
import WhatLinksHereWidget from "../widgets/what_links_here.js";
|
|
||||||
import AttributesWidget from "../widgets/attributes.js";
|
|
||||||
import TitleBarButtonsWidget from "../widgets/title_bar_buttons.js";
|
|
||||||
import GlobalMenuWidget from "../widgets/global_menu.js";
|
|
||||||
import StandardTopWidget from "../widgets/standard_top_widget.js";
|
|
||||||
import treeCache from "./tree_cache.js";
|
import treeCache from "./tree_cache.js";
|
||||||
import NotePathsWidget from "../widgets/note_paths.js";
|
|
||||||
import RunScriptButtonsWidget from "../widgets/run_script_buttons.js";
|
|
||||||
import ProtectedNoteSwitchWidget from "../widgets/protected_note_switch.js";
|
|
||||||
import NoteTypeWidget from "../widgets/note_type.js";
|
|
||||||
import NoteActionsWidget from "../widgets/note_actions.js";
|
|
||||||
import bundleService from "./bundle.js";
|
import bundleService from "./bundle.js";
|
||||||
import DialogEventComponent from "./dialog_events.js";
|
import DialogEventComponent from "./dialog_events.js";
|
||||||
import Entrypoints from "./entrypoints.js";
|
import Entrypoints from "./entrypoints.js";
|
||||||
import CalendarWidget from "../widgets/calendar.js";
|
|
||||||
import options from "./options.js";
|
import options from "./options.js";
|
||||||
import utils from "./utils.js";
|
import utils from "./utils.js";
|
||||||
import treeService from "./tree.js";
|
import treeService from "./tree.js";
|
||||||
import SidePaneContainer from "../widgets/side_pane_container.js";
|
|
||||||
import ZoomService from "./zoom.js";
|
import ZoomService from "./zoom.js";
|
||||||
import SidePaneToggles from "../widgets/side_pane_toggles.js";
|
import Layout from "../widgets/layout.js";
|
||||||
import FlexContainer from "../widgets/flex_container.js";
|
|
||||||
|
|
||||||
class AppContext {
|
class AppContext {
|
||||||
constructor() {
|
constructor(layout) {
|
||||||
|
this.layout = layout;
|
||||||
this.components = [];
|
this.components = [];
|
||||||
/** @type {TabContext[]} */
|
/** @type {TabContext[]} */
|
||||||
this.tabContexts = [];
|
this.tabContexts = [];
|
||||||
@ -129,47 +106,7 @@ class AppContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
showWidgets() {
|
showWidgets() {
|
||||||
this.tabRow = new TabRowWidget(this);
|
const rootContainer = this.layout.getRootWidget(this);
|
||||||
this.noteTreeWidget = new NoteTreeWidget(this);
|
|
||||||
|
|
||||||
const rootContainer = new FlexContainer(this, { 'flex-direction': 'column', 'height': '100vh' }, [
|
|
||||||
new FlexContainer(this, { 'flex-direction': 'row' }, [
|
|
||||||
new GlobalMenuWidget(this),
|
|
||||||
this.tabRow,
|
|
||||||
new TitleBarButtonsWidget(this)
|
|
||||||
]),
|
|
||||||
new StandardTopWidget(this),
|
|
||||||
new FlexContainer(this, { 'flex-direction': 'row' }, [
|
|
||||||
new SidePaneContainer(this, 'left', [
|
|
||||||
new GlobalButtonsWidget(this),
|
|
||||||
new SearchBoxWidget(this),
|
|
||||||
new SearchResultsWidget(this),
|
|
||||||
this.noteTreeWidget
|
|
||||||
]),
|
|
||||||
new FlexContainer(this, { id: 'center-pane', 'flex-direction': 'column' }, [
|
|
||||||
new FlexContainer(this, { 'flex-direction': 'row' }, [
|
|
||||||
new TabCachingWidget(this, () => new NotePathsWidget(this)),
|
|
||||||
new NoteTitleWidget(this),
|
|
||||||
new RunScriptButtonsWidget(this),
|
|
||||||
new ProtectedNoteSwitchWidget(this),
|
|
||||||
new NoteTypeWidget(this),
|
|
||||||
new NoteActionsWidget(this)
|
|
||||||
]),
|
|
||||||
new TabCachingWidget(this, () => new PromotedAttributesWidget(this)),
|
|
||||||
new TabCachingWidget(this, () => new NoteDetailWidget(this))
|
|
||||||
]),
|
|
||||||
new SidePaneContainer(this, 'right', [
|
|
||||||
new NoteInfoWidget(this),
|
|
||||||
new TabCachingWidget(this, () => new CalendarWidget(this)),
|
|
||||||
new TabCachingWidget(this, () => new AttributesWidget(this)),
|
|
||||||
new TabCachingWidget(this, () => new LinkMapWidget(this)),
|
|
||||||
new TabCachingWidget(this, () => new NoteRevisionsWidget(this)),
|
|
||||||
new TabCachingWidget(this, () => new SimilarNotesWidget(this)),
|
|
||||||
new TabCachingWidget(this, () => new WhatLinksHereWidget(this))
|
|
||||||
]),
|
|
||||||
new SidePaneToggles(this)
|
|
||||||
])
|
|
||||||
]);
|
|
||||||
|
|
||||||
$("body").append(rootContainer.render());
|
$("body").append(rootContainer.render());
|
||||||
|
|
||||||
@ -456,7 +393,9 @@ class AppContext {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const appContext = new AppContext();
|
const layout = new Layout();
|
||||||
|
|
||||||
|
const appContext = new AppContext(layout);
|
||||||
|
|
||||||
// we should save all outstanding changes before the page/app is closed
|
// we should save all outstanding changes before the page/app is closed
|
||||||
$(window).on('beforeunload', () => {
|
$(window).on('beforeunload', () => {
|
||||||
|
|||||||
70
src/public/javascripts/widgets/layout.js
Normal file
70
src/public/javascripts/widgets/layout.js
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
import FlexContainer from "./flex_container.js";
|
||||||
|
import GlobalMenuWidget from "./global_menu.js";
|
||||||
|
import TabRowWidget from "./tab_row.js";
|
||||||
|
import TitleBarButtonsWidget from "./title_bar_buttons.js";
|
||||||
|
import StandardTopWidget from "./standard_top_widget.js";
|
||||||
|
import SidePaneContainer from "./side_pane_container.js";
|
||||||
|
import GlobalButtonsWidget from "./global_buttons.js";
|
||||||
|
import SearchBoxWidget from "./search_box.js";
|
||||||
|
import SearchResultsWidget from "./search_results.js";
|
||||||
|
import NoteTreeWidget from "./note_tree.js";
|
||||||
|
import TabCachingWidget from "./tab_caching_widget.js";
|
||||||
|
import NotePathsWidget from "./note_paths.js";
|
||||||
|
import NoteTitleWidget from "./note_title.js";
|
||||||
|
import RunScriptButtonsWidget from "./run_script_buttons.js";
|
||||||
|
import ProtectedNoteSwitchWidget from "./protected_note_switch.js";
|
||||||
|
import NoteTypeWidget from "./note_type.js";
|
||||||
|
import NoteActionsWidget from "./note_actions.js";
|
||||||
|
import PromotedAttributesWidget from "./promoted_attributes.js";
|
||||||
|
import NoteDetailWidget from "./note_detail.js";
|
||||||
|
import NoteInfoWidget from "./note_info.js";
|
||||||
|
import CalendarWidget from "./calendar.js";
|
||||||
|
import AttributesWidget from "./attributes.js";
|
||||||
|
import LinkMapWidget from "./link_map.js";
|
||||||
|
import NoteRevisionsWidget from "./note_revisions.js";
|
||||||
|
import SimilarNotesWidget from "./similar_notes.js";
|
||||||
|
import WhatLinksHereWidget from "./what_links_here.js";
|
||||||
|
import SidePaneToggles from "./side_pane_toggles.js";
|
||||||
|
|
||||||
|
export default class Layout {
|
||||||
|
getRootWidget(appContext) {
|
||||||
|
return new FlexContainer(appContext, { 'flex-direction': 'column', 'height': '100vh' }, [
|
||||||
|
new FlexContainer(appContext, { 'flex-direction': 'row' }, [
|
||||||
|
new GlobalMenuWidget(appContext),
|
||||||
|
new TabRowWidget(appContext),
|
||||||
|
new TitleBarButtonsWidget(appContext)
|
||||||
|
]),
|
||||||
|
new StandardTopWidget(appContext),
|
||||||
|
new FlexContainer(appContext, { 'flex-direction': 'row' }, [
|
||||||
|
new SidePaneContainer(appContext, 'left', [
|
||||||
|
new GlobalButtonsWidget(appContext),
|
||||||
|
new SearchBoxWidget(appContext),
|
||||||
|
new SearchResultsWidget(appContext),
|
||||||
|
new NoteTreeWidget(appContext)
|
||||||
|
]),
|
||||||
|
new FlexContainer(appContext, { id: 'center-pane', 'flex-direction': 'column' }, [
|
||||||
|
new FlexContainer(appContext, { 'flex-direction': 'row' }, [
|
||||||
|
new TabCachingWidget(appContext, () => new NotePathsWidget(appContext)),
|
||||||
|
new NoteTitleWidget(appContext),
|
||||||
|
new RunScriptButtonsWidget(appContext),
|
||||||
|
new ProtectedNoteSwitchWidget(appContext),
|
||||||
|
new NoteTypeWidget(appContext),
|
||||||
|
new NoteActionsWidget(appContext)
|
||||||
|
]),
|
||||||
|
new TabCachingWidget(appContext, () => new PromotedAttributesWidget(appContext)),
|
||||||
|
new TabCachingWidget(appContext, () => new NoteDetailWidget(appContext))
|
||||||
|
]),
|
||||||
|
new SidePaneContainer(appContext, 'right', [
|
||||||
|
new NoteInfoWidget(appContext),
|
||||||
|
new TabCachingWidget(appContext, () => new CalendarWidget(appContext)),
|
||||||
|
new TabCachingWidget(appContext, () => new AttributesWidget(appContext)),
|
||||||
|
new TabCachingWidget(appContext, () => new LinkMapWidget(appContext)),
|
||||||
|
new TabCachingWidget(appContext, () => new NoteRevisionsWidget(appContext)),
|
||||||
|
new TabCachingWidget(appContext, () => new SimilarNotesWidget(appContext)),
|
||||||
|
new TabCachingWidget(appContext, () => new WhatLinksHereWidget(appContext))
|
||||||
|
]),
|
||||||
|
new SidePaneToggles(appContext)
|
||||||
|
])
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -35,6 +35,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
|
|||||||
|
|
||||||
window.glob.cutIntoNote = () => this.cutIntoNoteListener();
|
window.glob.cutIntoNote = () => this.cutIntoNoteListener();
|
||||||
|
|
||||||
|
this.appContext.noteTreeWidget = this;
|
||||||
|
|
||||||
this.tree = null;
|
this.tree = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -234,6 +234,12 @@ const TAB_ROW_TPL = `
|
|||||||
</div>`;
|
</div>`;
|
||||||
|
|
||||||
export default class TabRowWidget extends BasicWidget {
|
export default class TabRowWidget extends BasicWidget {
|
||||||
|
constructor(appContext) {
|
||||||
|
super(appContext);
|
||||||
|
|
||||||
|
appContext.tabRow = this;
|
||||||
|
}
|
||||||
|
|
||||||
doRender() {
|
doRender() {
|
||||||
this.$widget = $(TAB_ROW_TPL);
|
this.$widget = $(TAB_ROW_TPL);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user