gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

more refactoring ...

Browse Source
This commit is contained in:
zadam 2020-01-12 23:03:55 +01:00
parent bf7541bfb9
commit 17e2627a34
6 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import TabContext from "./tab_context.js";
import server from "./server.js"; import server from "./server.js";
import keyboardActionService from "./keyboard_actions.js"; import keyboardActionService from "./keyboard_actions.js";
import TabRowWidget from "./tab_row.js"; import TabRowWidget from "./tab_row.js";
import NoteTitleWidget from "../widgets/note_title.js";
class AppContext { class AppContext {
constructor() { constructor() {
@ -27,6 +28,9 @@ class AppContext {
$("#global-menu-wrapper").after(contents); $("#global-menu-wrapper").after(contents);
this.noteTitleWidget = new NoteTitleWidget(this);
$("#center-pane").prepend(this.noteTitleWidget.render());
this.noteTreeWidget = new NoteTreeWidget(this); this.noteTreeWidget = new NoteTreeWidget(this);
this.widgets = [ this.widgets = [
@ -41,14 +45,26 @@ class AppContext {
$leftPane.append($widget); $leftPane.append($widget);
} }
this.widgets.push(this.noteTitleWidget);
} }
trigger(name, data) { trigger(name, data) {
this.eventReceived(name, data);
for (const widget of this.widgets) { for (const widget of this.widgets) {
widget.eventReceived(name, data); widget.eventReceived(name, data);
} }
} }
eventReceived(name, data) {
const fun = this[name + 'Listener'];
if (typeof fun === 'function') {
fun.call(this, data);
}
}
/** @return {TabContext[]} */ /** @return {TabContext[]} */
getTabContexts() { getTabContexts() {
return this.tabContexts; return this.tabContexts;

2
src/public/javascripts/services/note_detail.js
View File

@ -118,7 +118,7 @@ async function loadNoteDetail(origNotePath, options = {}) {
const loadPromise = loadNoteDetailToContext(ctx, loadedNote, notePath).then(() => { const loadPromise = loadNoteDetailToContext(ctx, loadedNote, notePath).then(() => {
if (activate) { if (activate) {
appContext.activateTab(ctx); return appContext.activateTab(ctx);
} }
else { else {
return Promise.resolve(); return Promise.resolve();

5
src/public/javascripts/services/tab_context.js
View File

@ -138,6 +138,8 @@ class TabContext {
// after loading new note make sure editor is scrolled to the top // after loading new note make sure editor is scrolled to the top
this.getComponent().scrollToTop(); this.getComponent().scrollToTop();
appContext.trigger('activeNoteChanged');
} }
async show() { async show() {
@ -175,9 +177,6 @@ class TabContext {
this.$noteDetailComponents.hide(); this.$noteDetailComponents.hide();
this.$noteTitle.show(); // this can be hidden by empty detail
this.$noteTitle.removeAttr("readonly"); // this can be set by protected session service
this.getComponent().show(); this.getComponent().show();
await this.getComponent().render(); await this.getComponent().render();
} }

2
src/public/javascripts/services/tab_row.js
View File

@ -380,8 +380,6 @@ export default class TabRowWidget extends BasicWidget {
} }
addTab(tabId) { addTab(tabId) {
console.log("Adding tab", tabId);
const div = document.createElement('div'); const div = document.createElement('div');
div.innerHTML = TAB_TPL; div.innerHTML = TAB_TPL;
const tabEl = div.firstElementChild; const tabEl = div.firstElementChild;

2
src/public/javascripts/services/tree.js
View File

@ -271,8 +271,6 @@ async function treeInitialized() {
filteredTabs[0].active = true; filteredTabs[0].active = true;
} }
console.log("filteredTabs", filteredTabs);
for (const tab of filteredTabs) { for (const tab of filteredTabs) {
await noteDetailService.loadNoteDetail(tab.notePath, { await noteDetailService.loadNoteDetail(tab.notePath, {
state: tab, state: tab,

16
src/public/javascripts/widgets/note_title.js
View File

@ -101,18 +101,18 @@ export default class NoteTitleWidget extends TabAwareWidget {
doRender() { doRender() {
const $widget = $(TPL); const $widget = $(TPL);
this.$noteTitle = this.$tabContent.find(".note-title"); this.$noteTitle = $widget.find(".note-title");
this.$noteTitleRow = this.$tabContent.find(".note-title-row"); this.$noteTitleRow = $widget.find(".note-title-row");
this.$notePathList = this.$tabContent.find(".note-path-list"); this.$notePathList = $widget.find(".note-path-list");
this.$notePathCount = this.$tabContent.find(".note-path-count"); this.$notePathCount = $widget.find(".note-path-count");
this.$protectButton = this.$tabContent.find(".protect-button"); this.$protectButton = $widget.find(".protect-button");
this.$protectButton.on('click', protectedSessionService.protectNoteAndSendToServer); this.$protectButton.on('click', protectedSessionService.protectNoteAndSendToServer);
this.$unprotectButton = this.$tabContent.find(".unprotect-button"); this.$unprotectButton = $widget.find(".unprotect-button");
this.$unprotectButton.on('click', protectedSessionService.unprotectNoteAndSendToServer); this.$unprotectButton.on('click', protectedSessionService.unprotectNoteAndSendToServer);
this.$savedIndicator = this.$tabContent.find(".saved-indicator"); this.$savedIndicator = $widget.find(".saved-indicator");
this.noteType = new NoteTypeWidget(this); this.noteType = new NoteTypeWidget(this);
@ -147,7 +147,7 @@ export default class NoteTitleWidget extends TabAwareWidget {
async activeTabChanged() { async activeTabChanged() {
const note = this.tabContext.note; const note = this.tabContext.note;
this.$noteTitle.val(this.note.title); this.$noteTitle.val(note.title);
this.$protectButton.toggleClass("active", note.isProtected); this.$protectButton.toggleClass("active", note.isProtected);
this.$protectButton.prop("disabled", note.isProtected); this.$protectButton.prop("disabled", note.isProtected);