Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 18:05:55 +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

20
public/javascripts/dialogs/recent_notes.js
View File

@@ -13,31 +13,31 @@ const recentNotes = (function() {
type: 'GET',
error: () => showError("Error getting recent notes.")
}).then(result => {
list = result.map(r => r.note_id);
list = result.map(r => r.note_tree_id);
});
function addRecentNote(noteTreeId, noteContentId) {
function addRecentNote(noteTreeId) {
setTimeout(() => {
// we include the note into recent list only if the user stayed on the note at least 5 seconds
if (noteTreeId === noteEditor.getCurrentNoteId() || noteContentId === noteEditor.getCurrentNoteId()) {
if (noteTreeId === noteEditor.getCurrentNoteId()) {
$.ajax({
url: baseApiUrl + 'recent-notes/' + noteTreeId,
type: 'PUT',
error: () => showError("Error setting recent notes.")
}).then(result => {
list = result.map(r => r.note_id);
list = result.map(r => r.note_tree_id);
});
}
}, 1500);
}
function removeRecentNote(noteIdToRemove) {
function removeRecentNote(noteTreeIdToRemove) {
$.ajax({
url: baseApiUrl + 'recent-notes/' + noteIdToRemove,
url: baseApiUrl + 'recent-notes/' + noteTreeIdToRemove,
type: 'DELETE',
error: () => showError("Error removing note from recent notes.")
}).then(result => {
list = result.map(r => r.note_id);
list = result.map(r => r.note_tree_id);
});
}
@@ -56,15 +56,15 @@ const recentNotes = (function() {
// remove the current note
const recNotes = list.filter(note => note !== noteEditor.getCurrentNoteId());
$.each(recNotes, (key, valueNoteId) => {
const noteTitle = treeUtils.getFullName(valueNoteId);
$.each(recNotes, (key, valueNoteTreeId) => {
const noteTitle = treeUtils.getFullName(valueNoteTreeId);
if (!noteTitle) {
return;
}
const option = $("<option></option>")
.attr("value", valueNoteId)
.attr("value", valueNoteTreeId)
.text(noteTitle);
// select the first one (most recent one) by default