last note viewed is displayed after loading the app. Doesn't work well with cloned notes yet, also scrolling to the item in the tree doesn't work yet.

This commit is contained in:
azivner 2017-08-22 21:23:10 -04:00
parent f5c07f0e19
commit e58b8e6c40
3 changed files with 20 additions and 5 deletions

View File

@ -10,6 +10,8 @@ from sql import delete, execute, insert, getResults, getSingleResult, commit
class Notes(Resource): class Notes(Resource):
def get(self, note_id): def get(self, note_id):
execute("update options set opt_value = ? where opt_name = 'start_node'", [note_id])
return { return {
'detail': getSingleResult("select * from notes where note_id = ?", [note_id]), 'detail': getSingleResult("select * from notes where note_id = ?", [note_id]),
'formatting': getResults("select * from formatting where note_id = ? order by note_offset", [note_id]), 'formatting': getResults("select * from formatting where note_id = ? order by note_offset", [note_id]),

View File

@ -1,8 +1,6 @@
from flask_restful import Resource from flask_restful import Resource
from sql import getResults
from flask_restful import Resource
from sql import getResults from sql import getResults, getSingleResult
class Tree(Resource): class Tree(Resource):
@ -35,4 +33,8 @@ class Tree(Resource):
parent['children'].append(note) parent['children'].append(note)
parent['folder'] = True parent['folder'] = True
return rootNotes retObject = {}
retObject['notes'] = rootNotes
retObject['start_note_id'] = getSingleResult('select * from options where opt_name = "start_node"')['opt_value'];
return retObject

View File

@ -1,5 +1,8 @@
$(function(){ $(function(){
$.get(baseUrl + 'tree').then(notes => { $.get(baseUrl + 'tree').then(resp => {
const notes = resp.notes;
const startNoteId = resp.start_note_id;
function copyTitle(notes) { function copyTitle(notes) {
for (let note of notes) { for (let note of notes) {
note.title = note.note_title; note.title = note.note_title;
@ -33,6 +36,7 @@ $(function(){
} }
$("#tree").fancytree({ $("#tree").fancytree({
autoScroll: true,
extensions: ["hotkeys"], extensions: ["hotkeys"],
source: notes, source: notes,
activate: function(event, data){ activate: function(event, data){
@ -47,6 +51,13 @@ $(function(){
collapse: function(event, data) { collapse: function(event, data) {
setExpanded(data.node.key, false); setExpanded(data.node.key, false);
}, },
init: function(event, data) {
console.log("Activating...");
if (startNoteId) {
data.tree.activateKey(startNoteId);
}
},
hotkeys: { hotkeys: {
keydown: { keydown: {
"insert": function(node) { "insert": function(node) {