mirror of
https://github.com/zadam/trilium.git
synced 2025-11-03 03:46:37 +01:00
fixes, separation of notefull from noteshort
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
import protectedSessionHolder from "./protected_session_holder.js";
|
||||
import server from "./server.js";
|
||||
import bundleService from "./bundle.js";
|
||||
import Attributes from "./attributes.js";
|
||||
import utils from "./utils.js";
|
||||
import optionsService from "./options.js";
|
||||
import appContext from "./app_context.js";
|
||||
import treeService from "./tree.js";
|
||||
import noteDetailService from "./note_detail.js";
|
||||
import Component from "../widgets/component.js";
|
||||
import treeCache from "./tree_cache.js";
|
||||
|
||||
let showSidebarInNewTab = true;
|
||||
|
||||
@@ -28,10 +28,6 @@ class TabContext extends Component {
|
||||
this.tabId = state.tabId || utils.randomString(4);
|
||||
this.state = state;
|
||||
|
||||
this.attributes = new Attributes(this.appContext, this);
|
||||
|
||||
this.children.push(this.attributes);
|
||||
|
||||
this.trigger('tabOpened', {tabId: this.tabId});
|
||||
}
|
||||
|
||||
@@ -52,8 +48,11 @@ class TabContext extends Component {
|
||||
this.notePath = notePath;
|
||||
const noteId = treeService.getNoteIdFromNotePath(notePath);
|
||||
|
||||
/** @property {NoteShort} */
|
||||
this.note = await treeCache.getNote(noteId);
|
||||
|
||||
/** @property {NoteFull} */
|
||||
this.note = await noteDetailService.loadNote(noteId);
|
||||
this.noteFull = await noteDetailService.loadNoteFull(noteId);
|
||||
|
||||
//this.cleanup(); // esp. on windows autocomplete is not getting closed automatically
|
||||
|
||||
@@ -85,30 +84,6 @@ class TabContext extends Component {
|
||||
this.trigger('tabRemoved', {tabId: this.tabId});
|
||||
}
|
||||
|
||||
async saveNote() {
|
||||
return; // FIXME
|
||||
|
||||
if (this.note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable()) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.note.title = this.$noteTitle.val();
|
||||
this.note.content = this.getComponent().getContent();
|
||||
|
||||
// it's important to set the flag back to false immediatelly after retrieving title and content
|
||||
// otherwise we might overwrite another change (especially async code)
|
||||
this.isNoteChanged = false;
|
||||
|
||||
const resp = await server.put('notes/' + this.note.noteId, this.note.dto);
|
||||
|
||||
this.note.dateModified = resp.dateModified;
|
||||
this.note.utcDateModified = resp.utcDateModified;
|
||||
|
||||
if (this.note.isProtected) {
|
||||
protectedSessionHolder.touchProtectedSession();
|
||||
}
|
||||
}
|
||||
|
||||
isActive() {
|
||||
return this.appContext.activeTabId === this.tabId;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user