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

notes_tree now has note_tree_id so we stricly distinguish between working on notes or note trees

Browse Source
This commit is contained in:
azivner
2017-11-18 17:05:50 -05:00
parent dec9cad106
commit 5fb94fcbbd
17 changed files with 203 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
public/javascripts/note_editor.js
View File

@@ -92,7 +92,7 @@ const noteEditor = (function() {
const title = noteTitleEl.val();
treeUtils.getNodeByKey(note.detail.note_id).setTitle(title);
noteTree.getCurrentNode().setTitle(title);
note.detail.note_title = title;
}
@@ -121,7 +121,7 @@ const noteEditor = (function() {
let newNoteCreated = false;
async function createNote(node, parentKey, target, isProtected) {
async function createNote(node, parentTreeId, target, isProtected) {
// if isProtected isn't available (user didn't enter password yet), then note is created as unencrypted
// but this is quite weird since user doesn't see where the note is being created so it shouldn't occur often
if (!isProtected || !protected_session.isProtectedSessionAvailable()) {
@@ -131,12 +131,12 @@ const noteEditor = (function() {
const newNoteName = "new note";
const result = await $.ajax({
url: baseApiUrl + 'notes/' + parentKey + '/children' ,
url: baseApiUrl + 'notes/' + parentTreeId + '/children' ,
type: 'POST',
data: JSON.stringify({
note_title: newNoteName,
target: target,
target_note_id: node.key,
target_note_id: node.note_tree_id,
is_protected: isProtected
}),
contentType: "application/json"
@@ -144,13 +144,14 @@ const noteEditor = (function() {
const newNode = {
title: newNoteName,
key: result.note_id,
key: counter++,
note_id: result.note_id,
note_tree_id: result.note_tree_id,
is_protected: isProtected,
extraClasses: isProtected ? "protected" : ""
};
glob.allNoteIds.push(result.note_id);
glob.allNoteIds.push(result.note_tree_id);
newNoteCreated = true;
@@ -167,11 +168,6 @@ const noteEditor = (function() {
showMessage("Created!");
}
function setTreeBasedOnProtectedStatus(note) {
const node = treeUtils.getNodeByKey(note.detail.note_id);
node.toggleClass("protected", !!note.detail.is_protected);
}
function setNoteBackgroundIfProtected(note) {
if (note.detail.is_protected) {
$(".note-editable").addClass("protected");
@@ -184,7 +180,7 @@ const noteEditor = (function() {
unprotectButton.hide();
}
setTreeBasedOnProtectedStatus(note);
noteTree.setCurrentNoteTreeBasedOnProtectedStatus();
}
async function loadNoteToEditor(noteId) {
@@ -217,10 +213,6 @@ const noteEditor = (function() {
noteDetailEl.summernote('code', currentNote.detail.note_text);
document.location.hash = noteId;
recentNotes.addRecentNote(noteId, currentNote.detail.note_id);
noteChangeDisabled = false;
setNoteBackgroundIfProtected(currentNote);