Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

better behavior of activateNote frontend script

Browse Source
This commit is contained in:
zadam
2019-08-12 22:25:42 +02:00
parent dfa1ab65c6
commit 493cd1a7e0
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/public/javascripts/services/frontend_script_api.js
View File

@@ -40,9 +40,13 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
this.activateNote = async (notePath, noteLoadedListener) => { this.activateNote = async (notePath, noteLoadedListener) => {
await treeService.activateNote(notePath, noteLoadedListener); await treeService.activateNote(notePath, async () => {
await treeService.scrollToActiveNote(); await treeService.scrollToActiveNote();
if (noteLoadedListener) {
noteLoadedListener();
}
});
}; };
/** /**

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

@@ -562,7 +562,7 @@ async function collapseTree(node = null) {
} }
function focusTree() { function focusTree() {
$tree.find('.fancytree-container').focus(); getTree().setFocus();
} }
async function scrollToActiveNote() { async function scrollToActiveNote() {
@@ -573,8 +573,8 @@ async function scrollToActiveNote() {
const node = await expandToNote(activeContext.notePath); const node = await expandToNote(activeContext.notePath);
node.makeVisible({scrollIntoView: true}); await node.makeVisible({scrollIntoView: true});
node.setFocus(true); node.setFocus();
} }
} }